Merge branch 'z9s' into z9s_luci

# Conflicts: # init.sh
jjm2473 · Jul 27, 2019 · 45d4e43 · 45d4e43
2 parents 9e54a4f + 1469c95
commit 45d4e43
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/init.sh b/init.sh
@@ -15,7 +15,8 @@ echo './proc
 ./mnt
 ./dev
 ./acct
-./data' | xargs -n1 sh -c 'mkdir -p root/mnt/android/$0'
+./data' | xargs -n1 sh -c 'mkdir -p root/mnt/android/$0; chmod 755 root/mnt/android/$0'
 
-chmod 771 root/mnt/android/data
 chmod 750 root/mnt/android/sbin
+chmod 771 root/mnt/android/data
+chmod 770 root/mnt/android/cache
diff --git a/root/mnt/android/default.prop b/root/mnt/android/default.prop
@@ -26,7 +26,7 @@ debug.atrace.tags.enableflags=0
 #
 # BOOTIMAGE_BUILD_PROPERTIES
 #
-ro.bootimage.build.date=2019年 01月 24日 星期四 17:44:33 CST
-ro.bootimage.build.date.utc=1548323073
-ro.bootimage.build.fingerprint=realtek/rtk_kylin32/kylin32:7.1.1/N9F27C/jiangb01241744:eng/test-keys
-persist.sys.usb.config=adb
+ro.bootimage.build.date=2019年 07月 11日 星期四 18:39:44 CST
+ro.bootimage.build.date.utc=1562841584
+ro.bootimage.build.fingerprint=realtek/rtk_kylin32/kylin32:7.1.1/N9F27C/jiangb07111839:eng/test-keys
+persist.sys.usb.config=none
diff --git a/root/mnt/android/file_contexts.bin b/root/mnt/android/file_contexts.bin
diff --git a/root/mnt/android/init.kylin.rc b/root/mnt/android/init.kylin.rc
@@ -307,3 +307,29 @@ service gapps_installer /system/bin/gapps_installer.sh
     group root
     disabled
     oneshot
+
+#jiangbo one rooot
+service zidoo_root /system/bin/zidoo_root.sh
+    user root
+    group root
+    disabled
+    oneshot
+
+service zidoo_unroot /system/bin/zidoo_unroot.sh
+    user root
+    group root
+    disabled
+    oneshot
+#jiangbo one rooot
+
+#jiangbo su daemon
+service su_daemon /system/xbin/su --daemon
+    seclabel u:r:sudaemon:s0
+    oneshot
+
+on property:persist.sys.root_access=0
+    stop su_daemon
+
+on property:persist.sys.root_access=1
+    start su_daemon
+
diff --git a/root/mnt/android/sbin/adbd b/root/mnt/android/sbin/adbd
diff --git a/root/mnt/android/selinux_version b/root/mnt/android/selinux_version
@@ -1 +1 @@
-realtek/rtk_kylin32/kylin32:7.1.1/N9F27C/jiangb12291112:eng/test-keys
+realtek/rtk_kylin32/kylin32:7.1.1/N9F27C/jiangb06271734:eng/test-keys
diff --git a/root/mnt/android/sepolicy b/root/mnt/android/sepolicy