Fix phh-securize.sh with Magisk modules

With Magisk, depending on enabled modules, directories like /system/xbin, /system/app and others could be tmpfs,
with /system/xbin/su and /system/app/me.phh.superuser being bind-mounts.

So we should try to operate on the real system partition.
This commit is contained in:
Loïc Yhuel 2020-05-10 01:20:02 +02:00 committed by GitHub
parent e3af52cfdf
commit 7698971538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions

View File

@ -1,18 +1,28 @@
#!/system/bin/sh
mount -o remount,rw /
mount -o remount,rw /system
SYSTEM=/system
[ -d /sbin/.magisk/mirror/system ] && SYSTEM=/sbin/.magisk/mirror/system
for MOUNTPOINT in \
/sbin/.magisk/mirror/system_root \
/sbin/.magisk/mirror/system \
/system \
/
do
[ -d $MOUNTPOINT ] && mountpoint -q $MOUNTPOINT && break
done
mount -o remount,rw $MOUNTPOINT
remount
touch /system/phh/secure
umount -l /system/xbin/su
rm /system/xbin/su
rm /system/bin/phh-su
rm /system/etc/init/su.rc
rm /system/bin/phh-securize.sh
rm -Rf /system/{app,priv-app}/me.phh.superuser/
touch $SYSTEM/phh/secure
umount -l $SYSTEM/xbin/su
rm $SYSTEM/xbin/su
rm $SYSTEM/bin/phh-su
rm $SYSTEM/etc/init/su.rc
rm $SYSTEM/bin/phh-securize.sh
rm -Rf $SYSTEM/{app,priv-app}/me.phh.superuser/
rm -Rf /data/su || true
mount -o remount,ro /
mount -o remount,ro /system
mount -o remount,ro $MOUNTPOINT
sync
reboot