Skip to content

Commit

Permalink
installer/addon: Check A/B partitioning with ro.build.ab_update instead
Browse files Browse the repository at this point in the history
* As osm0sis suggested [here](opengapps#879 (comment))
  some A only devices, seem to report slot as _a.

* So check with ro.build.ab_update instead
  • Loading branch information
merothh committed Sep 5, 2020
1 parent 061bd6d commit 472b607
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions scripts/bkup_tail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ EOF
}

mount_generic() {
local active_slot=$(getprop ro.boot.slot_suffix)
local device_abpartition=$(getprop ro.build.ab_update)
local partitions="$*"
if [ -z "$active_slot" ]; then
if [ -z "$device_abpartition" ]; then
# We're on an A only device
local partition
for partition in $partitions; do
Expand Down
5 changes: 1 addition & 4 deletions scripts/templates/installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1067,10 +1067,7 @@ ui_print " "
device_abpartition=false
system_as_root=`getprop ro.build.system_root_image`
if [ "$system_as_root" = "true" ]; then
active_slot=`getprop ro.boot.slot_suffix`
if [ ! -z "$active_slot" ]; then
device_abpartition=true
fi
device_abpartition=$(getprop ro.build.ab_update)
fi

# _____________________________________________________________________________________________________________________
Expand Down

0 comments on commit 472b607

Please sign in to comment.