diff options
| author | Brian Swetland <swetland@google.com> | 2010-09-08 15:51:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 15:51:10 -0700 |
| commit | e6d8a5f1dfb81113b9421ea353915cde426023ed (patch) | |
| tree | 3c9d68e3ee330f18cf443b404cdbacaf12ad2ce4 /rootdir | |
| parent | 0159abaf0854eb639c91ea65f14dbd37064bae46 (diff) | |
| parent | 8df3a4a554184afba71887995c5f0983ce81196f (diff) | |
| download | system_core-e6d8a5f1dfb81113b9421ea353915cde426023ed.zip system_core-e6d8a5f1dfb81113b9421ea353915cde426023ed.tar.gz system_core-e6d8a5f1dfb81113b9421ea353915cde426023ed.tar.bz2 | |
am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
Merge commit '8df3a4a554184afba71887995c5f0983ce81196f'
* commit '8df3a4a554184afba71887995c5f0983ce81196f':
remount / as read-only only on post-fs to allow per-target config of /
Diffstat (limited to 'rootdir')
| -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 fdc36c8..e7100b5 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -54,8 +54,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 @@ -92,6 +90,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 |