summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBowgo Tsai <bowgotsai@google.com>2018-05-17 21:53:56 +0800
committerBowgo Tsai <bowgotsai@google.com>2018-05-19 09:34:48 +0800
commit27fdbce115dea066262333ef798980338a6d5c19 (patch)
tree8929f74359cfa8badef398383facdf25c56b6f80
parentc4547885620f75af5c75c4bd59c2e9b6d36f35e3 (diff)
downloadextras-27fdbce115dea066262333ef798980338a6d5c19.tar.gz
cppreopts: using /dev/block/by-name/system_{ab} for postinstall
/dev/block/bootdevice/by-name/system_{ab} should not be used because there is no requirement of a single boot device. Replace it with /dev/block/by-name/system_{ab}. Bug: 78613232 Test: factory wipe, reboot device to check logcat Change-Id: Ia3a476ef7a4b271eff90f44ef4e04fdbee17052b Merged-In: Ia3a476ef7a4b271eff90f44ef4e04fdbee17052b (cherry picked from commit 5ede0b2dc72585d14cc3ef09e6e8c5776dcac9a7)
-rw-r--r--cppreopts/cppreopts.rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cppreopts/cppreopts.rc b/cppreopts/cppreopts.rc
index 07a7674f..9892d023 100644
--- a/cppreopts/cppreopts.rc
+++ b/cppreopts/cppreopts.rc
@@ -13,7 +13,7 @@
# limitations under the License.
on property:sys.cppreopt=requested && property:ro.boot.slot_suffix=_a
- mount ext4 /dev/block/bootdevice/by-name/system_b /postinstall ro nosuid nodev noexec
+ mount ext4 /dev/block/by-name/system_b /postinstall ro nosuid nodev noexec
exec - root -- /system/bin/cppreopts.sh /postinstall
# Optional script to copy additional preloaded content to data directory
exec - system system -- /system/bin/preloads_copy.sh /postinstall
@@ -21,7 +21,7 @@ on property:sys.cppreopt=requested && property:ro.boot.slot_suffix=_a
setprop sys.cppreopt finished
on property:sys.cppreopt=requested && property:ro.boot.slot_suffix=_b
- mount ext4 /dev/block/bootdevice/by-name/system_a /postinstall ro nosuid nodev noexec
+ mount ext4 /dev/block/by-name/system_a /postinstall ro nosuid nodev noexec
exec - root -- /system/bin/cppreopts.sh /postinstall
# Optional script to copy additional preloaded content to data directory
exec - system system -- /system/bin/preloads_copy.sh /postinstall