|
|
|
@ -57,14 +57,11 @@ mount_apex_loop () {
|
|
|
|
|
|
|
|
|
|
apex_mount="${1}"
|
|
|
|
|
|
|
|
|
|
echo " *** mount_apex_loop [apex_mount]: ${apex_mount}"
|
|
|
|
|
|
|
|
|
|
while [ ${number} -lt 64 ]; do
|
|
|
|
|
loop=/dev/block/loop${number}
|
|
|
|
|
[ -e ${loop} ] || mknod ${loop} b 7 $((number * minorx))
|
|
|
|
|
|
|
|
|
|
if losetup "${loop}" /apex/apex_payload.img 2>/dev/null; then
|
|
|
|
|
echo " *** mount_apex_loop [loop]: ${loop}"
|
|
|
|
|
if mount -text4 -oro,noatime "${loop}" "${apex_mount}"; then
|
|
|
|
|
rm -f /apex/apex_payload.img
|
|
|
|
|
break
|
|
|
|
@ -104,9 +101,6 @@ mount_apex () {
|
|
|
|
|
export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime
|
|
|
|
|
export ANDROID_TZDATA_ROOT=/apex/com.android.tzdata
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
echo " INFO: #10 [APEX_LD] ${APEX_LD}"
|
|
|
|
|
echo " INFO: #11 [APEX [ALL]] $(ls /system/apex/*)"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# taken from Magisk, with minor modifications for NanoDroid
|
|
|
|
@ -116,21 +110,16 @@ mount_partitions () {
|
|
|
|
|
SYSTEM_AS_ROOT=FALSE
|
|
|
|
|
|
|
|
|
|
SLOT=$(grep_cmdline androidboot.slot_suffix)
|
|
|
|
|
echo " INFO: #1 [SLOT] ${SLOT}"
|
|
|
|
|
if [ -z ${SLOT} ]; then
|
|
|
|
|
SLOT=$(grep_cmdline androidboot.slot)
|
|
|
|
|
echo " INFO: #2 [SLOT] ${SLOT}"
|
|
|
|
|
if [ ! -z ${SLOT} ]; then
|
|
|
|
|
SLOT=_${SLOT}
|
|
|
|
|
echo " INFO: #3 [SLOT] ${SLOT}"
|
|
|
|
|
DEVICE_AB=TRUE
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
system_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name system${SLOT} | head -n 1)
|
|
|
|
|
echo " INFO: #4 [system_tmp] ${system_tmp}"
|
|
|
|
|
SYSTEM_BLOCK=$(readlink -f ${system_tmp})
|
|
|
|
|
echo " INFO: #5 [SYSTEM_BLOCK] ${SYSTEM_BLOCK}"
|
|
|
|
|
|
|
|
|
|
is_mounted /data || mount /data || error "failed to mount /data!"
|
|
|
|
|
|
|
|
|
@ -148,9 +137,7 @@ mount_partitions () {
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
vendor_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name vendor${SLOT} | head -n 1)
|
|
|
|
|
echo " INFO: #6 [vendor_tmp] ${vendor_tmp}"
|
|
|
|
|
VENDOR_BLOCK=$(readlink -f ${vendor_tmp})
|
|
|
|
|
echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
|
|
|
|
|
|
|
|
|
|
! is_mounted /vendor && mount -o ro /vendor || mount -o ro ${VENDOR_BLOCK} /vendor
|
|
|
|
|
|
|
|
|
@ -160,16 +147,9 @@ mount_partitions () {
|
|
|
|
|
ln -sf /system/vendor /vendor >/dev/null
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
echo " "
|
|
|
|
|
mount | sed -e '/magisk/d' | awk '{print $1 " on " $3 " params: " $6}'
|
|
|
|
|
echo " "
|
|
|
|
|
|
|
|
|
|
echo " INFO: #8 [prop]"
|
|
|
|
|
ls -l /system/*.prop
|
|
|
|
|
|
|
|
|
|
export build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
|
|
|
|
echo " INFO: #9 [build_props] ${build_props}"
|
|
|
|
|
|
|
|
|
|
build_props=$(find /system /system_root /vendor -type f -name build.prop)
|
|
|
|
|
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
|
|
|
|
|
|
|
|
|
|
[ -d /system/apex ] && mount_apex
|
|
|
|
|