init: move the init.sh execution to the post-fs stage

[android-x86/device-generic-common.git] / init.x86.rc

diff --git a/init.x86.rc b/init.x86.rc
index 9001841..42ae1c3 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -1,59 +1,31 @@
+import /init.bluetooth.rc
 import /init.superuser.rc
 
 on early-init
-    mount debugfs debugfs /sys/kernel/debug
-    chmod 755 /sys/kernel/debug
     write /proc/sys/kernel/ctrl-alt-del 1
 
     write /sys/module/xt_qtaguid/parameters/ctrl_write_limited N
 
     export force_s3tc_enable true
-#   export EGL_LOG_LEVEL info
+    export EGL_LOG_LEVEL info
 #   export EGL_DRIVERS egl_dri2
 
 on init
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-    mkdir /mnt/media_rw/usb0 0700 media_rw media_rw
-    mkdir /storage/usb0 0700 root root
-    mkdir /mnt/media_rw/usb1 0700 media_rw media_rw
-    mkdir /storage/usb1 0700 root root
-    mkdir /mnt/media_rw/usb2 0700 media_rw media_rw
-    mkdir /storage/usb2 0700 root root
-    mkdir /mnt/media_rw/usb3 0700 media_rw media_rw
-    mkdir /storage/usb3 0700 root root
-    mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
-    mkdir /storage/sdcard1 0700 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-    export SECONDARY_STORAGE /storage/usb0:/storage/usb1:/storage/usb2:/storage/usb3:/storage/sdcard1
-
-    # Support legacy paths
-    symlink /storage/emulated/legacy /sdcard
-    symlink /storage/emulated/legacy /mnt/sdcard
-    symlink /storage/emulated/legacy /storage/sdcard0
-    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
 
     # Backward compatibility
     symlink system/lib /lib
 
-    # device information
-    setprop ro.product.manufacturer $[/sys/class/dmi/id/sys_vendor]
-    setprop ro.product.model $[/sys/class/dmi/id/product_name]
-
-    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
-
 on fs
     mount_all /fstab.${ro.hardware}
-    setprop ro.crypto.fuse_sdcard true
+
+on post-fs
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
 
 on post-fs-data
     sysclktz 1
 
-    mkdir /data/media 0770 media_rw media_rw
-
     mkdir /data/misc/wifi 0770 wifi wifi
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
@@ -63,9 +35,6 @@ on post-fs-data
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1
 
-on early-boot
-    readprops /x86.prop
-
 on boot
     setprop ro.radio.use-ppp yes
     setprop ro.radio.noril no
@@ -86,7 +55,6 @@ on boot
     setprop sys.media.vdec.drop 0
 
 service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplicant.conf \
-    -ddddd \
     -iwlan0 -Dnl80211 \
     -O/data/misc/wifi/sockets \
     -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
@@ -118,39 +86,22 @@ service iprenew_eth0 /system/bin/dhcpcd -n
     disabled
     oneshot
 
-service enable_houdini /system/bin/enable_houdini
+service nativebridge /system/bin/enable_nativebridge
     class main
+    disabled
     oneshot
 
 service powerbtnd /system/bin/powerbtnd
     class late_start
 
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
-    class late_start
-
-service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
-    class late_start
-    disabled
-
-service fuse_usb0 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb0 /storage/usb0
-    class late_start
-    disabled
-
-service fuse_usb1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb1 /storage/usb1
-    class late_start
-    disabled
-
-service fuse_usb2 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb2 /storage/usb2
-    class late_start
-    disabled
-
-service fuse_usb3 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb3 /storage/usb3
-    class late_start
-    disabled
-
 service logcat /system/bin/logcat -v threadtime -f /data/log.txt
     class debug
 
+service btattach /system/bin/btattach -Pbcm
+    class main
+    disabled
+    oneshot
+
 service wacom-input /system/bin/wacom-input
     disabled
     oneshot
@@ -170,10 +121,26 @@ on property:system_init.startsurfaceflinger=0
 
 on property:sys.boot_completed=1
     write /proc/sys/kernel/ctrl-alt-del 0
-    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
+
+on property:init.svc.bluetoothd=running
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
+
+on property:init.svc.bluetoothd=stopped
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
 
 on property:net.dns1=*
-    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
 
 on property:debug.logcat=1
     class_start debug
+
+on property:persist.sys.nativebridge=1
+    mkdir /data/arm 0775 system system
+    start nativebridge
+
+on property:persist.sys.nativebridge=0
+    stop nativebridge
+
+on property:debug.egl.hw=0
+    setprop ro.kernel.qemu 1