Revert "Revert"

This reverts commit 29c7629af7966379f9a78f4548fd40ec02ed355e.

1 files changed, 18 insertions, 14 deletions

diff --git a/init.aries.rc b/init.aries.rc
index 6854808..49bec9a 100644
--- a/init.aries.rc
+++ b/init.aries.rc
@@ -1,8 +1,11 @@
 on init
     loglevel 9
     export PHONE_STORAGE /mnt/emmc
+    export EXTERNAL_STORAGE /mnt/sdcard
     mkdir /mnt/emmc 0000 system system
     symlink /mnt/emmc /emmc
+    mkdir /mnt/sdcard 0000 system system
+    symlink /mnt/sdcard /sdcard
     mkdir /datadata 0771 system system
 
 on boot
@@ -74,10 +77,6 @@ on fs
     chown gps root /sys/class/sec/gps/GPS_PWR_EN/value
     chmod 660 /sys/class/sec/gps/GPS_PWR_EN/value
 
-# wi-fi
-    mkdir /data/misc/wifi/sockets 0770 wifi wifi
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-
     symlink /datadata /data/data
 on post-fs
 
@@ -101,6 +100,11 @@ on post-fs
     chown root system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
     chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
 
+on post-fs-data
+    # wi-fi
+    mkdir /data/misc/wifi/sockets 0770 wifi wifi
+    mkdir /data/misc/dhcp 0770 dhcp dhcp
+
 # 3D init
 service pvrsrvinit /system/vendor/bin/pvrsrvinit
     class core
@@ -109,29 +113,29 @@ service pvrsrvinit /system/vendor/bin/pvrsrvinit
     oneshot
 
 service gpsd /system/vendor/bin/gpsd -c /vendor/etc/gps.xml
-    class main
+    class core
     socket gps seqpacket 0660 gps system
     user gps
     group system inet
 
 service wpa_supplicant /system/bin/wpa_supplicant -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf
-    class main
+    class core
     socket wpa_eth0 dgram 0660 wifi wifi
     disabled
     oneshot
 
 service dhcpcd_eth0 /system/bin/dhcpcd -ABKL
-    class main
+    class core
     disabled
     oneshot
 
 service iprenew_eth0 /system/bin/dhcpcd -n
-    class main
+    class core
     disabled
     oneshot
 
 service bdaddr /system/bin/bdaddr_read
-    class main
+    class core
     user root
     disabled
     oneshot
@@ -141,7 +145,7 @@ on property:init.svc.bootanim=running
 
 service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm \
     --baudrate 3000000 --patchram /vendor/firmware/bcm4329.hcd /dev/s3c2410_serial0
-    class main
+    class core
     user bluetooth
     group bluetooth net_bt_admin
     disabled
@@ -149,22 +153,22 @@ service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm \
 
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -v -o /sdcard/bugreports/bugreport
-    class main
+    class core
     disabled
     oneshot
     keycodes 114 115 116
 
 service orientationd /system/vendor/bin/orientationd
-    class main
+    class core
     user compass
     group system input
 
 service geomagneticd /system/vendor/bin/geomagneticd
-    class main
+    class core
     user compass
     group system input
 
 service tvout /system/bin/tvoutserver
-    class main
+    class core
     user system
     group graphics