aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-06-15 20:57:59 -0700
committerMike Lockwood <lockwood@android.com>2010-06-15 22:48:30 -0700
commita2dffa9db6c08c240e9511faee1c16fea535ef3e (patch)
treebfcc7c782da90789e4987bf534f0929aeabd17e8
parent5ab8fed240cea2263d593864837fa1372188ce2d (diff)
downloadsystem_core-a2dffa9db6c08c240e9511faee1c16fea535ef3e.tar.gz
system_core-a2dffa9db6c08c240e9511faee1c16fea535ef3e.tar.bz2
system_core-a2dffa9db6c08c240e9511faee1c16fea535ef3e.zip
init.rc: Move SD card support to device specific init.rc files
Change-Id: I5745e91df2b7c5722bd6e650931d3d2d7d0eadcb Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--rootdir/etc/init.goldfish.rc6
-rw-r--r--rootdir/init.rc10
2 files changed, 9 insertions, 7 deletions
diff --git a/rootdir/etc/init.goldfish.rc b/rootdir/etc/init.goldfish.rc
index 569555c6..6f308436 100644
--- a/rootdir/etc/init.goldfish.rc
+++ b/rootdir/etc/init.goldfish.rc
@@ -1,3 +1,9 @@
+on early-init
+ export EXTERNAL_STORAGE /mnt/sdcard
+ mkdir /mnt/sdcard 0000 system system
+ # for backwards compatibility
+ symlink /mnt/sdcard /sdcard
+
on boot
setprop ARGH ARGH
setprop net.eth0.dns1 10.0.2.3
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 20005456..ab4b72b5 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -1,6 +1,9 @@
on early-init
start ueventd
+# create mountpoints
+ mkdir /mnt 0775 root system
+
on init
sysclktz 0
@@ -14,7 +17,6 @@ loglevel 3
export ANDROID_ROOT /system
export ANDROID_ASSETS /system/app
export ANDROID_DATA /data
- export EXTERNAL_STORAGE /mnt/sdcard
export ASEC_MOUNTPOINT /mnt/asec
export BOOTCLASSPATH /system/framework/core.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar
@@ -22,18 +24,12 @@ loglevel 3
symlink /system/etc /etc
symlink /sys/kernel/debug /d
-# create mountpoints
- mkdir /mnt 0775 root system
- mkdir /mnt/sdcard 0000 system system
# Create cgroup mount point for cpu accounting
mkdir /acct
mount cgroup none /acct cpuacct
mkdir /acct/uid
-# Backwards Compat - XXX: Going away in G*
- symlink /mnt/sdcard /sdcard
-
mkdir /system
mkdir /data 0771 system system
mkdir /cache 0770 system cache