diff options
| author | Alex Deymo <deymo@google.com> | 2016-03-04 08:01:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-04 08:01:40 +0000 |
| commit | e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43 (patch) | |
| tree | 60d12e7915c90c3a41433aeaa14c1cbec08929ee /rootdir | |
| parent | 55592371dca3ccb25d516635b41bab73ed8b6059 (diff) | |
| parent | 700b15dacfa42bcc5c4d768b92530e9f20f0211b (diff) | |
| download | system_core-e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43.tar.gz system_core-e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43.tar.bz2 system_core-e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43.zip | |
Merge "Add /postinstall partition when using the A/B updater."
am: 700b15dacf
* commit '700b15dacfa42bcc5c4d768b92530e9f20f0211b':
Add /postinstall partition when using the A/B updater.
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 5 | ||||
| -rw-r--r-- | rootdir/init.rc | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index d90f988cc..d53af2ffe 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -70,6 +70,11 @@ ifdef BOARD_ROOT_EXTRA_SYMLINKS ; mkdir -p $(dir $(TARGET_ROOT_OUT)/$(word 2,$(p))) \ ; ln -sf $(word 1,$(p)) $(TARGET_ROOT_OUT)/$(word 2,$(p))) endif +# The A/B updater uses a top-level /postinstall directory to mount the new +# system before reboot. +ifeq ($(AB_OTA_UPDATER),true) + LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/postinstall +endif include $(BUILD_SYSTEM)/base_rules.mk diff --git a/rootdir/init.rc b/rootdir/init.rc index 8ce476071..6d5023e4d 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -23,6 +23,9 @@ on early-init # Shouldn't be necessary, but sdcard won't start without it. http://b/22568628. mkdir /mnt 0775 root system + # Set the security context of /postinstall if present. + restorecon /postinstall + start ueventd on init |