diff options
| author | Brian Swetland <swetland@google.com> | 2010-09-08 15:08:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 15:08:16 -0700 |
| commit | 8df3a4a554184afba71887995c5f0983ce81196f (patch) | |
| tree | c7d342d4efa26069f2f759e0cd8fa16dfb536391 | |
| parent | 1f43492e48fb6630f3200a9b3887c76377f1850d (diff) | |
| parent | 4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4 (diff) | |
| download | system_core-8df3a4a554184afba71887995c5f0983ce81196f.zip system_core-8df3a4a554184afba71887995c5f0983ce81196f.tar.gz system_core-8df3a4a554184afba71887995c5f0983ce81196f.tar.bz2 | |
am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
Merge commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4' into gingerbread-plus-aosp
* commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4':
remount / as read-only only on post-fs to allow per-target config of /
| -rw-r--r-- | rootdir/init.rc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 1e3e2d2..78a5927 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -58,8 +58,6 @@ loglevel 3 mkdir /mnt/obb 0700 root system mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000 - mount rootfs rootfs / ro remount - write /proc/sys/kernel/panic_on_oops 1 write /proc/sys/kernel/hung_task_timeout_secs 0 write /proc/cpu/alignment 4 @@ -96,6 +94,9 @@ on fs mount yaffs2 mtd@cache /cache nosuid nodev on post-fs + # once everything is setup, no need to modify / + mount rootfs rootfs / ro remount + # We chown/chmod /data again so because mount is run as root + defaults chown system system /data chmod 0771 /data |