From 4fd3446b4e7bb962c20bea022e917a903fce74e1 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 12 May 2015 14:35:31 -0700
Subject: init sets the default PATH itself, better.

This fixes 'su' and 'strace' in the recovery image.

Change-Id: I83c2664d32a15da92bb6092fbdfc772184013c88
---
 etc/init.rc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'etc')

diff --git a/etc/init.rc b/etc/init.rc
index 6c07c6027..0a4c6e9df 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -5,7 +5,6 @@ on early-init
     start healthd
 
 on init
-    export PATH /sbin:/system/bin
     export ANDROID_ROOT /system
     export ANDROID_DATA /data
     export EXTERNAL_STORAGE /sdcard
-- 
cgit v1.2.3


From 90c75b0beb375b8d261e2df92292e9b542470f6e Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Mon, 6 Jul 2015 10:44:33 -0700
Subject: Change init sequence to support file level encryption

File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
---
 etc/init.rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/init.rc b/etc/init.rc
index 6c07c6027..427727768 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -47,8 +47,8 @@ on boot
     class_start default
 
 # Load properties from /system/ + /factory after fs mount.
-on load_all_props_action
-    load_all_props
+on load_system_props_action
+    load_system_props
 
 on firmware_mounts_complete
    rm /dev/.booting
@@ -63,7 +63,7 @@ on late-init
     # Load properties from /system/ + /factory after fs mount. Place
     # this in another action so that the load will be scheduled after the prior
     # issued fs triggers have completed.
-    trigger load_all_props_action
+    trigger load_system_props_action
 
     # Remove a file to wake up anything waiting for firmware
     trigger firmware_mounts_complete
-- 
cgit v1.2.3


From 080f522fb9d58a9c47c0c3b79c32a61ba3c2bfc8 Mon Sep 17 00:00:00 2001
From: Alex Deymo <deymo@google.com>
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

(cherry picked from commit 6bcc8af6e5a5bf9cc0987305cdfa24d4f6e4afa9)

Change-Id: I8320559f014cfb14216dcc350e016fc1db05cb14
---
 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