From 1cc85b7e3cfade8449c206c86c14dd55f548c634 Mon Sep 17 00:00:00 2001 From: Danesh Mondegarian Date: Wed, 2 Nov 2011 14:03:13 -0400 Subject: Aries : Cleanup Use global init.rc Depends on : http://review.cyanogenmod.com/#change,9739 http://review.cyanogenmod.com/#change,9741 http://review.cyanogenmod.com/#change,9742 http://review.cyanogenmod.com/#change,9743 http://review.cyanogenmod.com/#change,9744 http://review.cyanogenmod.com/#change,9745 Change-Id: Ia6a2553f31d3dc1f9a886f88721d0070d2c57788 --- init.aries.rc | 220 ++++------------------------------------------------------ 1 file changed, 12 insertions(+), 208 deletions(-) (limited to 'init.aries.rc') diff --git a/init.aries.rc b/init.aries.rc index 131a023..003d3e9 100644 --- a/init.aries.rc +++ b/init.aries.rc @@ -1,18 +1,21 @@ +on init + loglevel 9 + export PHONE_STORAGE /mnt/emmc + mkdir /mnt/emmc 0000 system system + symlink /mnt/emmc /emmc + mkdir /datadata 0771 system system + on boot mount debugfs /sys/kernel/debug /sys/kernel/debug -# Backwards Compat - XXX: Going away in G* - symlink /system/etc /etc - symlink /mnt/sdcard /sdcard - symlink /mnt/emmc /emmc + # Tweak background writeout + write /proc/sys/vm/dirty_writeback_centisecs 2000 + write /proc/sys/vm/dirty_expire_centisecs 1000 + write /proc/sys/vm/dirty_ratio 90 # Include extra init file - import /system/etc/init.local.rc import /device.rc -# Run sysinit - exec /system/bin/sysinit - setprop ro.build.product aries setprop ro.product.device aries setprop ro.radio.noril yes @@ -51,9 +54,6 @@ on boot on fs mkdir /radio 0775 radio radio - mount yaffs2 mtd@system /system - mount yaffs2 mtd@system /system ro remount - mount yaffs2 mtd@cache /cache mount yaffs2 mtd@radio /radio mount ext4 /dev/block/mmcblk0p2 /data wait nosuid nodev noatime nodiratime noauto_da_alloc mount yaffs2 mtd@datadata /datadata @@ -88,92 +88,9 @@ on post-fs chown system system /datadata chmod 0771 /datadata - # Create dump dir and collect dumps. - # Do this before we mount cache so eventually we can use cache for - # storing dumps on platforms which do not have a dedicated dump partition. - - mkdir /data/dontpanic - chown root log /data/dontpanic - chmod 0750 /data/dontpanic - - # Collect apanic data, free resources and re-arm trigger - copy /proc/apanic_console /data/dontpanic/apanic_console - chown root log /data/dontpanic/apanic_console - chmod 0640 /data/dontpanic/apanic_console - - copy /proc/apanic_threads /data/dontpanic/apanic_threads - chown root log /data/dontpanic/apanic_threads - chmod 0640 /data/dontpanic/apanic_threads - - write /proc/apanic_console 1 - - # Same reason as /data above - chown system cache /cache - chmod 0771 /cache - - # This may have been created by the recovery system with odd permissions - chown system cache /cache/recovery - chmod 0770 /cache/recovery - - #change permissions on vmallocinfo so we can grab it from bugreports - chown root log /proc/vmallocinfo - chmod 0440 /proc/vmallocinfo - - #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks - chown root system /proc/kmsg - chmod 0440 /proc/kmsg - chown root system /proc/sysrq-trigger - chmod 0220 /proc/sysrq-trigger - -# create basic filesystem structure - mkdir /data/misc 01771 system misc - mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth - mkdir /data/misc/bluetooth 0770 system system - mkdir /data/misc/keystore 0700 keystore keystore - mkdir /data/misc/vpn 0770 system system - mkdir /data/misc/systemkeys 0700 system system - mkdir /data/misc/vpn/profiles 0770 system system - # give system access to wpa_supplicant.conf for backup and restore - mkdir /data/misc/wifi 0770 wifi wifi - chmod 0770 /data/misc/wifi - chmod 0660 /data/misc/wifi/wpa_supplicant.conf - mkdir /data/local 0771 shell shell - mkdir /data/local/tmp 0771 shell shell - #mkdir /data/data 0771 system system - # symlink /data/data to /datadata for performance - symlink /datadata /data/data - - mkdir /data/app-private 0771 system system - mkdir /data/app 0771 system system - mkdir /data/property 0700 root root - - # create dalvik-cache and double-check the perms - mkdir /data/dalvik-cache 0771 system system - chown system system /data/dalvik-cache - chmod 0771 /data/dalvik-cache - - mkdir /cache/dalvik-cache 0771 system system - chown system system /cache/dalvik-cache - chmod 0771 /cache/dalvik-cache - - # create the lost+found directories, so as to enforce our permissions - mkdir /data/lost+found 0770 - mkdir /cache/lost+found 0770 - - # double check the perms, in case lost+found already exists, and set owner - chown root root /data/lost+found - chmod 0770 /data/lost+found - chown root root /cache/lost+found - chmod 0770 /cache/lost+found - - # allow net_raw to have access to /dev/socket directory - chown root net_raw /dev/socket - chmod 0775 /dev/socket - #symlinks for samsung RIL symlink /radio/modem.bin /dev/block/bml12 - - + # allow system to modify cpufreq control files chown root system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor @@ -226,110 +143,6 @@ service bugreport /system/bin/dumpstate -d -v -o /sdcard/bugreports/bugreport disabled oneshot keycodes 114 115 116 - -service servicemanager /system/bin/servicemanager - user system - critical - onrestart restart zygote - onrestart restart media - -service vold /system/bin/vold - socket vold stream 0660 root mount - ioprio be 2 - -service netd /system/bin/netd - socket netd stream 0660 root system - socket dnsproxyd stream 0660 root inet - -service debuggerd /system/bin/debuggerd - -service ril-daemon /system/bin/rild - socket rild stream 660 root radio - socket rild-debug stream 660 radio system - user root - group radio cache inet misc audio sdcard_rw net_admin net_raw - -service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server - socket zygote stream 666 - onrestart write /sys/android_power/request_state wake - onrestart write /sys/power/state on - onrestart restart media - onrestart restart netd - -service media /system/bin/mediaserver - user media - group system audio camera graphics inet net_bt net_bt_admin net_raw - ioprio rt 4 - -service bootanim /system/bin/bootanimation - user graphics - group graphics - disabled - oneshot - -service dbus /system/bin/dbus-daemon --system --nofork - socket dbus stream 660 bluetooth bluetooth - user bluetooth - group bluetooth net_bt_admin - -service bluetoothd /system/bin/bluetoothd -n - socket bluetooth stream 660 bluetooth bluetooth - socket dbus_bluetooth stream 660 bluetooth bluetooth - # init.rc does not yet support applying capabilities, so run as root and - # let bluetoothd drop uid to bluetooth with the right linux capabilities - group bluetooth net_bt_admin misc - disabled - -service hfag /system/bin/sdptool add --channel=10 HFAG - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service hsag /system/bin/sdptool add --channel=11 HSAG - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service opush /system/bin/sdptool add --channel=12 OPUSH - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service pbap /system/bin/sdptool add --channel=19 PBAP - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - -service installd /system/bin/installd - socket installd stream 600 system system - -service racoon /system/bin/racoon - socket racoon stream 600 system system - # racoon will setuid to vpn after getting necessary resources. - group net_admin - disabled - oneshot - -service mtpd /system/bin/mtpd - socket mtpd stream 600 system system - user vpn - group vpn net_admin net_raw - disabled - oneshot - -service keystore /system/bin/keystore /data/misc/keystore - user keystore - group keystore - socket keystore stream 666 - -service dumpstate /system/bin/dumpstate -s - socket dumpstate stream 0660 shell log - disabled - oneshot service orientationd /system/vendor/bin/orientationd user compass @@ -342,12 +155,3 @@ service geomagneticd /system/vendor/bin/geomagneticd service tvout /system/bin/tvoutserver user system group graphics - -service console /system/bin/sh - console - disabled - user shell - group log - -on property:ro.secure=0 - start console -- cgit v1.1