diff options
| author | Dima Zavin <dima@android.com> | 2012-08-01 09:49:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-01 09:49:59 -0700 |
| commit | 018227f5394c3126f4a858596cb85dee1893b895 (patch) | |
| tree | fdd85d3fe0a095710eba3c918b9608ec90f9a79e /rootdir | |
| parent | aeec25dabd57ec39208b7e3adefab649e51b86e0 (diff) | |
| parent | ce76e2d00e63339083ea693db33de05cbba5600e (diff) | |
| download | system_core-018227f5394c3126f4a858596cb85dee1893b895.zip system_core-018227f5394c3126f4a858596cb85dee1893b895.tar.gz system_core-018227f5394c3126f4a858596cb85dee1893b895.tar.bz2 | |
am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."
* commit 'ce76e2d00e63339083ea693db33de05cbba5600e':
Modify init.rc and init.goldfish.rc for SE Android.
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/etc/init.goldfish.rc | 4 | ||||
| -rw-r--r-- | rootdir/init.rc | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/rootdir/etc/init.goldfish.rc b/rootdir/etc/init.goldfish.rc index 83b7f8a..cde9dee 100644 --- a/rootdir/etc/init.goldfish.rc +++ b/rootdir/etc/init.goldfish.rc @@ -5,6 +5,10 @@ on early-init symlink /mnt/sdcard /sdcard on boot + setsebool in_qemu=1 + restorecon /sys/qemu_trace/process_name + restorecon /sys/qemu_trace/state + restorecon /sys/qemu_trace/symbol setprop ARGH ARGH setprop net.eth0.gw 10.0.2.2 setprop net.eth0.dns1 10.0.2.3 diff --git a/rootdir/init.rc b/rootdir/init.rc index 25e6750..76a4ff1 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -12,6 +12,10 @@ on early-init # Set init and its forked children's oom_adj. write /proc/1/oom_adj -16 + # Set the security context for the init process. + # This should occur before anything else (e.g. ueventd) is started. + setcon u:r:init:s0 + start ueventd # create mountpoints @@ -128,10 +132,14 @@ on post-fs # We chown/chmod /cache again so because mount is run as root + defaults chown system cache /cache chmod 0770 /cache + # We restorecon /cache in case the cache partition has been reset. + restorecon /cache # This may have been created by the recovery system with odd permissions chown system cache /cache/recovery chmod 0770 /cache/recovery + # This may have been created by the recovery system with the wrong context. + restorecon /cache/recovery #change permissions on vmallocinfo so we can grab it from bugreports chown root log /proc/vmallocinfo @@ -150,6 +158,8 @@ on post-fs-data # We chown/chmod /data again so because mount is run as root + defaults chown system system /data chmod 0771 /data + # We restorecon /data in case the userdata partition has been reset. + restorecon /data # Create dump dir and collect dumps. # Do this before we mount cache so eventually we can use cache for @@ -343,6 +353,7 @@ on property:vold.decrypt=trigger_shutdown_framework service ueventd /sbin/ueventd class core critical + seclabel u:r:ueventd:s0 service console /system/bin/sh class core @@ -358,6 +369,7 @@ on property:ro.debuggable=1 service adbd /sbin/adbd class core disabled + seclabel u:r:adbd:s0 # adbd on at boot in emulator on property:ro.kernel.qemu=1 |