From 6bcc8af6e5a5bf9cc0987305cdfa24d4f6e4afa9 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Wed, 2 Mar 2016 14:21:02 -0800 Subject: Restore labels on /postinstall during recovery. This patch mirrors what was done in the main init.rc to relabel /postinstall. Bug: 27178350 Bug: 27177071 Change-Id: I39cd03f3c55a42c03367957e8c259c9a3155203c --- etc/init.rc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index dc1865986..5915b8d80 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -1,6 +1,9 @@ import /init.recovery.${ro.hardware}.rc on early-init + # Set the security context of /postinstall if present. + restorecon /postinstall + start ueventd start healthd -- cgit v1.2.3 From ad29b10c009d3a41e6198ae3125fe93c5f4aeb6f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 9 Jun 2016 18:03:05 -0700 Subject: Remove etc/META-INF/com/google/android/update-script. Bug: http://b/29250988 Change-Id: I61f8c6717b38de2242e4ea8e0913237c1ce5bfea --- etc/META-INF/com/google/android/update-script | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 etc/META-INF/com/google/android/update-script (limited to 'etc') diff --git a/etc/META-INF/com/google/android/update-script b/etc/META-INF/com/google/android/update-script deleted file mode 100644 index b091b1927..000000000 --- a/etc/META-INF/com/google/android/update-script +++ /dev/null @@ -1,8 +0,0 @@ -assert compatible_with("0.1") == "true" -assert file_contains("SYSTEM:build.prop", "ro.product.device=dream") == "true" || file_contains("SYSTEM:build.prop", "ro.build.product=dream") == "true" -assert file_contains("RECOVERY:default.prop", "ro.product.device=dream") == "true" || file_contains("RECOVERY:default.prop", "ro.build.product=dream") == "true" -assert getprop("ro.product.device") == "dream" -format BOOT: -format SYSTEM: -copy_dir PACKAGE:system SYSTEM: -write_raw_image PACKAGE:boot.img BOOT: -- cgit v1.2.3 From 48ebb07211c4cd79244bdaf5b7335484b8ccdd46 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 15 Jun 2016 15:15:15 -0700 Subject: init now uses libprocessgroup, so set up /acct. Change-Id: Iec1492dfaf2ceae6f4d8618dd725d07316ee960b --- etc/init.rc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index 5915b8d80..29b088d14 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -14,6 +14,9 @@ on init symlink /system/etc /etc + mount cgroup none /acct cpuacct + mkdir /acct/uid + mkdir /sdcard mkdir /system mkdir /data -- cgit v1.2.3 From 544a1562d984aa1d76185de808b1a8d0f173987d Mon Sep 17 00:00:00 2001 From: Andriy Naborskyy Date: Mon, 10 Oct 2016 13:10:28 -0700 Subject: init: move healthd to late-init Starting healthd in early-init is not needed and can delay coldboot done Now healthd is starting at boot as usual service. Test: check kmsg that healthd starting after /dev/.coldboot_done Bug: 30292927 Change-Id: I367d022f5885122da49181db3db536012e83f564 --- etc/init.rc | 1 - 1 file changed, 1 deletion(-) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index 29b088d14..b1473ba4b 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -5,7 +5,6 @@ on early-init restorecon /postinstall start ueventd - start healthd on init export ANDROID_ROOT /system -- cgit v1.2.3 From c4b381c44b2c782fedcabf859882c643a7d06745 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Tue, 1 Nov 2016 08:49:51 -0700 Subject: healthd: change how charger is launched in recovery. This is triggered by changes in healthd which spits out 2 binaries. Recovery needs to use static binary which is now renamed to 'charger'. So, change the .rc file to match the rename. Update the seclable according to new healthd-charger split Test: Tested recovery on angler using 'reboot recovery' to ensure healthd is working as before Change-Id: I9e6018156e677e7224dd2e5894941ed2a7cac1d0 Signed-off-by: Sandeep Patil --- etc/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index b1473ba4b..faa7b2a1c 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -82,9 +82,9 @@ service ueventd /sbin/ueventd critical seclabel u:r:ueventd:s0 -service healthd /sbin/healthd -r +service charger /charger -r critical - seclabel u:r:healthd:s0 + seclabel u:r:charger:s0 service recovery /sbin/recovery seclabel u:r:recovery:s0 -- cgit v1.2.3 From e66f861a7c71f0d59fabd8ec1d096485faf0901e Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Wed, 4 Jan 2017 10:30:32 -0800 Subject: Write aliases before ffs mount in recovery This is necessary to support kernel changes that allow for multiple ffs functions. Some kernels require aliases in order to name function instances before mount time. Test: Reboot into recovery, verify adb works Bug: 34070894 Change-Id: I8376304d92af9b3e8c734fdb8cc77f0dc8bc4850 --- etc/init.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index faa7b2a1c..fa3689df9 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -30,6 +30,7 @@ on init write /proc/sys/vm/max_map_count 1000000 on fs + write /sys/class/android_usb/android0/f_ffs/aliases adb mkdir /dev/usb-ffs 0770 shell shell mkdir /dev/usb-ffs/adb 0770 shell shell mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000 @@ -37,7 +38,6 @@ on fs write /sys/class/android_usb/android0/enable 0 write /sys/class/android_usb/android0/idVendor 18D1 write /sys/class/android_usb/android0/idProduct D001 - write /sys/class/android_usb/android0/f_ffs/aliases adb write /sys/class/android_usb/android0/functions adb write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer} write /sys/class/android_usb/android0/iProduct ${ro.product.model} -- cgit v1.2.3 From 37ac94978c7632cc61c90ab912df581b5a9ed8fd Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Mon, 17 Apr 2017 16:55:54 -0700 Subject: init.rc: Remove sys.powerctl action Init now handles this property change directly. Bug: 37209359 Bug: 37415192 Test: Init reboots normally. Change-Id: I9a4925897fb83bed180d12c871d9a71126fa4aa8 (cherry picked from commit 4608daf0fe6b5feb11afbfb6ae613d7a5161c95d) --- etc/init.rc | 3 --- 1 file changed, 3 deletions(-) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index fa3689df9..d8121cc4e 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -75,9 +75,6 @@ on late-init trigger early-boot trigger boot -on property:sys.powerctl=* - powerctl ${sys.powerctl} - service ueventd /sbin/ueventd critical seclabel u:r:ueventd:s0 -- cgit v1.2.3