From dea8c9c1ac3f42e60df19f51f60cc9712b1fb341 Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Tue, 17 Sep 2019 16:30:37 -0700 Subject: [PATCH] Moving recovery resources from /system to /vendor This change is part of a topic that moves the recovery resources from the system partition to the vendor partition, if it exists, or the vendor directory on the system partition otherwise. The recovery resources are moving from the system image to the vendor partition so that a single system image may be used with either an A/B or a non-A/B vendor image. The topic removes a delta in the system image that prevented such reuse in the past. The recovery resources that are moving are involved with updating the recovery partition after an update. In a non-A/B configuration, the system boots from the recovery partition, updates the other partitions (system, vendor, etc.) Then, the next time the system boots normally, a script updates the recovery partition (if necessary). This script, the executables it invokes, and the data files that it uses were previously on the system partition. The resources that are moving include the following. * install-recovery.sh * applypatch * recovery-resource.dat (if present) * recovery-from-boot.p (if present) This change moves the recovery resources to vendor in libcutils/fs_config.cpp and removes the flash_recovery service from rootdir/init.rc. This service moved to a vendor init.rc file in bootable/recovery/applypatch. Bug: 68319577 Test: Ensure that recovery partition is updated correctly. Change-Id: I492f7989ea8042912e9d0e0eadeaa351affbee13 --- libcutils/fs_config.cpp | 4 ++-- rootdir/init.rc | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index d0d83deb0..5fb11a51b 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -161,7 +161,6 @@ static const struct fs_path_config android_files[] = { { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/debuggerd" }, - { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" }, { 00550, AID_LOGD, AID_LOGD, 0, "system/bin/logd" }, { 00700, AID_ROOT, AID_ROOT, 0, "system/bin/secilc" }, { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" }, @@ -173,9 +172,10 @@ static const struct fs_path_config android_files[] = { { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.ril" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, - { 00440, AID_ROOT, AID_ROOT, 0, "system/etc/recovery.img" }, + { 00750, AID_ROOT, AID_ROOT, 0, "vendor/bin/install-recovery.sh" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" }, + { 00440, AID_ROOT, AID_ROOT, 0, "vendor/etc/recovery.img" }, { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, ven_conf_file + 1 }, diff --git a/rootdir/init.rc b/rootdir/init.rc index bad06425c..3b64b8275 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -917,7 +917,3 @@ on property:ro.debuggable=1 on init && property:ro.debuggable=1 start console - -service flash_recovery /system/bin/install-recovery.sh - class main - oneshot