Refactor fixSPL to prevent early exit
This commit is contained in:
parent
903725538c
commit
11cbdea0e9
24
rw-system.sh
24
rw-system.sh
@ -2,14 +2,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
if mount -o remount,rw /system;then
|
||||
resize2fs $(grep ' /system ' /proc/mounts |cut -d ' ' -f 1)
|
||||
elif mount -o remount,rw /;then
|
||||
resize2fs /dev/root
|
||||
fi
|
||||
mount -o remount,ro /system
|
||||
mount -o remount,ro /
|
||||
|
||||
fixSPL() {
|
||||
img="$(find /dev/block -type l |grep by-name |grep /kernel$(getprop ro.boot.slot_suffix) |head -n 1)"
|
||||
[ -z "$img" ] && img="$(find /dev/block -type l |grep by-name |grep /boot$(getprop ro.boot.slot_suffix) |head -n 1)"
|
||||
if [ -n "$img" ];then
|
||||
@ -20,7 +13,7 @@ if [ -n "$img" ];then
|
||||
|
||||
#Only Android 8.0 needs this
|
||||
if ! echo "$Arelease" |grep -qF 8.0;then
|
||||
exit 0
|
||||
return 0
|
||||
fi
|
||||
|
||||
for f in /vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so /system/lib64/vndk-26/libsoftkeymasterdevice.so;do
|
||||
@ -40,7 +33,20 @@ if [ -n "$img" ];then
|
||||
done
|
||||
setprop ctl.restart keymaster-3-0
|
||||
fi
|
||||
}
|
||||
|
||||
if mount -o remount,rw /system;then
|
||||
resize2fs $(grep ' /system ' /proc/mounts |cut -d ' ' -f 1)
|
||||
elif mount -o remount,rw /;then
|
||||
resize2fs /dev/root
|
||||
fi
|
||||
mount -o remount,ro /system
|
||||
mount -o remount,ro /
|
||||
|
||||
fixSPL
|
||||
|
||||
if grep vendor.huawei.hardware.biometrics.fingerprint /vendor/manifest.xml;then
|
||||
mount -o bind system/phh/huawei/fingerprint.kl /vendor/usr/keylayout/fingerprint.kl
|
||||
fi
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user