From c4fc13ab551167ddb3393e6cdf64045ecc54dab9 Mon Sep 17 00:00:00 2001 From: Pawit Pornkitprasan Date: Tue, 26 Feb 2013 13:17:04 +0700 Subject: aries-common: use common recovery.rc Note that init.recovery.aries.rc is intentionally copied to root instead of recovery/root, the build system will put it in the correct place. Change-Id: Ie8dc0a320c1ceb62e3679c4cfaf39d1553918982 --- BoardConfigCommon.mk | 1 - device_base.mk | 1 + init.recovery.aries.rc | 12 ++ recovery.rc | 294 ------------------------------------------------- 4 files changed, 13 insertions(+), 295 deletions(-) create mode 100644 init.recovery.aries.rc delete mode 100644 recovery.rc diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 37e6cc7..5c80381 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -35,7 +35,6 @@ TARGET_NO_RADIOIMAGE := true TARGET_PROVIDES_INIT := true TARGET_BOARD_PLATFORM := s5pc110 TARGET_BOOTLOADER_BOARD_NAME := aries -TARGET_RECOVERY_INITRC := device/samsung/aries-common/recovery.rc BOARD_MOBILEDATA_INTERFACE_NAME = "pdp0" BOARD_UMS_LUNFILE := /sys/class/android_usb/android0/f_mass_storage/lun/file diff --git a/device_base.mk b/device_base.mk index 3a5e44e..778b987 100644 --- a/device_base.mk +++ b/device_base.mk @@ -51,6 +51,7 @@ PRODUCT_COPY_FILES += \ device/samsung/aries-common/init.aries.rc:root/init.aries.rc \ device/samsung/aries-common/init.aries.gps.rc:root/init.aries.gps.rc \ device/samsung/aries-common/init.aries.usb.rc:root/init.aries.usb.rc \ + device/samsung/aries-common/init.recovery.aries.rc:root/init.recovery.aries.rc \ device/samsung/aries-common/init.aries.usb.rc:recovery/root/usb.rc \ device/samsung/aries-common/fstab.aries:root/fstab.aries \ device/samsung/aries-common/lpm.rc:root/lpm.rc \ diff --git a/init.recovery.aries.rc b/init.recovery.aries.rc new file mode 100644 index 0000000..22a6fa7 --- /dev/null +++ b/init.recovery.aries.rc @@ -0,0 +1,12 @@ +import usb.rc # Renamed init.aries.usb.rc, we can't use init*.rc because the build script will delete it + +on fs +# set up LVM volumes + exec /lvm/sbin/lvm vgscan --mknodes --ignorelockingfailure + exec /lvm/sbin/lvm vgchange -aly --ignorelockingfailure + +on boot + write /dev/graphics/fb3 1 + + # mass_storage support + setprop sys.usb.config mass_storage,adb diff --git a/recovery.rc b/recovery.rc deleted file mode 100644 index d5c9615..0000000 --- a/recovery.rc +++ /dev/null @@ -1,294 +0,0 @@ -import usb.rc # Renamed init.aries.usb.rc, we can't use init*.rc because the build script will delete it - -on early-init - start ueventd - -on init - -sysclktz 0 - -loglevel 9 - -# setup the global environment - export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin - export LD_LIBRARY_PATH /vendor/lib:/system/lib - export ANDROID_BOOTLOGO 1 - export ANDROID_ROOT /system - export ANDROID_ASSETS /system/app - export ANDROID_DATA /data - export EXTERNAL_STORAGE /mnt/sdcard - export SECONDARY_STORAGE /mnt/emmc - export ASEC_MOUNTPOINT /mnt/asec - export LOOP_MOUNTPOINT /mnt/obb - export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar - -# symlink /misc to /etc for recovery - symlink /misc /etc - -# Backward compatibility - symlink /sys/kernel/debug /d - -# Right now vendor lives on the same filesystem as system, -# but someday that may change. - symlink /system/vendor /vendor - -# create temp folder for recovery - mkdir /tmp - -# create mountpoints - mkdir /sdcard 0000 system system - mkdir /emmc 0000 system system - -# for emergencyboot - symlink /sdcard /mnt/sdcard - -# Create cgroup mount point for cpu accounting - mkdir /acct - mount cgroup none /acct cpuacct - mkdir /acct/uid - mkdir /system - mkdir /data 0771 system system - mkdir /cache 0770 system cache - mkdir /config 0500 root root - mkdir /efs - - # Directory for putting things only root should see. - mkdir /mnt/secure 0700 root root - - # Directory for staging bindmounts - mkdir /mnt/secure/staging 0700 root root - - # Directory-target for where the secure container - # imagefile directory will be bind-mounted - mkdir /mnt/secure/asec 0700 root root - - # Secure container public mount points. - mkdir /mnt/asec 0700 root system - mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000 - - # Filesystem image public mount points. - mkdir /mnt/obb 0700 root system - mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000 - - write /proc/sys/kernel/panic_on_oops 1 - write /proc/sys/kernel/hung_task_timeout_secs 0 - write /proc/cpu/alignment 4 - write /proc/sys/kernel/sched_latency_ns 10000000 - write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000 - write /proc/sys/kernel/sched_compat_yield 1 - write /proc/sys/kernel/sched_child_runs_first 0 - -# Create cgroup mount points for process groups - mkdir /dev/cpuctl - mount cgroup none /dev/cpuctl cpu - chown system system /dev/cpuctl - chown system system /dev/cpuctl/tasks - chmod 0777 /dev/cpuctl/tasks - write /dev/cpuctl/cpu.shares 1024 - - mkdir /dev/cpuctl/fg_boost - chown system system /dev/cpuctl/fg_boost/tasks - chmod 0777 /dev/cpuctl/fg_boost/tasks - write /dev/cpuctl/fg_boost/cpu.shares 1024 - - mkdir /dev/cpuctl/bg_non_interactive - chown system system /dev/cpuctl/bg_non_interactive/tasks - chmod 0777 /dev/cpuctl/bg_non_interactive/tasks - # 5.0 % - write /dev/cpuctl/bg_non_interactive/cpu.shares 52 - -on fs -# mount mtd partitions - # Mount /system rw first to give the filesystem a chance to save a checkpoint - #mount yaffs2 mtd@system /system - #mount yaffs2 mtd@cache /cache - #mount ext4 /dev/block/mmcblk0p2 /data nosuid nodev noatime nodiratime noauto_da_alloc - #mount yaffs2 mtd@datadata /datadata - -# set up LVM volumes - exec /lvm/sbin/lvm vgscan --mknodes --ignorelockingfailure - exec /lvm/sbin/lvm vgchange -aly --ignorelockingfailure - -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 - - # 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 0770 /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 - 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 - - # 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 - -on boot -# basic network init - ifup lo - hostname localhost - domainname localdomain - -# set RLIMIT_NICE to allow priorities from 19 to -20 - setrlimit 13 40 40 - - # Set init its forked children's oom_adj. - write /proc/1/oom_adj -16 - - # Tweak background writeout - write /proc/sys/vm/dirty_expire_centisecs 200 - write /proc/sys/vm/dirty_background_ratio 5 - - # Permissions for System Server and daemons. - chown radio system /sys/android_power/state - chown radio system /sys/android_power/request_state - chown radio system /sys/android_power/acquire_full_wake_lock - chown radio system /sys/android_power/acquire_partial_wake_lock - chown radio system /sys/android_power/release_wake_lock - chown radio system /sys/power/state - chown radio system /sys/power/wake_lock - chown radio system /sys/power/wake_unlock - chmod 0660 /sys/power/state - chmod 0660 /sys/power/wake_lock - chmod 0660 /sys/power/wake_unlock - chown system system /sys/class/timed_output/vibrator/enable - chown system system /sys/class/leds/keyboard-backlight/brightness - chown system system /sys/class/leds/lcd-backlight/brightness - chown system system /sys/class/leds/button-backlight/brightness - chown system system /sys/class/leds/jogball-backlight/brightness - chown system system /sys/class/leds/red/brightness - chown system system /sys/class/leds/green/brightness - chown system system /sys/class/leds/blue/brightness - chown system system /sys/class/leds/red/device/grpfreq - chown system system /sys/class/leds/red/device/grppwm - chown system system /sys/class/leds/red/device/blink - chown system system /sys/class/leds/red/brightness - chown system system /sys/class/leds/green/brightness - chown system system /sys/class/leds/blue/brightness - chown system system /sys/class/leds/red/device/grpfreq - chown system system /sys/class/leds/red/device/grppwm - chown system system /sys/class/leds/red/device/blink - chown system system /sys/class/timed_output/vibrator/enable - chown system system /sys/module/sco/parameters/disable_esco - chown system system /sys/kernel/ipv4/tcp_wmem_min - chown system system /sys/kernel/ipv4/tcp_wmem_def - chown system system /sys/kernel/ipv4/tcp_wmem_max - chown system system /sys/kernel/ipv4/tcp_rmem_min - chown system system /sys/kernel/ipv4/tcp_rmem_def - chown system system /sys/kernel/ipv4/tcp_rmem_max - chown root radio /proc/cmdline - -# Define TCP buffer sizes for various networks -# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax, - setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.wifi 4095,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.umts 4094,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.edge 4093,26280,35040,4096,16384,35040 - setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680 - - write /dev/graphics/fb3 1 - - class_start default - -## Daemon processes to be run by init. -## -service ueventd /sbin/ueventd - critical - -service console /sbin/sh - console - disabled - user shell - group log - -on property:ro.secure=0 - start console - -service recovery /sbin/recovery - -# adbd is controlled by the persist.service.adb.enable system property -service adbd /sbin/adbd - disabled - -# Always start adbd on userdebug and eng builds -# In recovery, always run adbd as root. -on property:ro.debuggable=1 - setprop sys.usb.config mass_storage,adb - setprop service.adb.root 1 - -# Restart adbd so it can run as root -on property:service.adb.root=1 - write /sys/class/android_usb/android0/enable 0 - restart adbd - write /sys/class/android_usb/android0/enable 1 - -on property:persist.service.adb.enable=1 - start adbd - -on property:persist.service.adb.enable=0 - stop adbd -- cgit v1.1