Archives
/
NanoDroid
mirror of https://gitlab.com/Nanolx/NanoDroid
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update mount code everywhere

Browse Source
merge-requests/33/head
Christopher Roy Bratusek 4 years ago
parent c5bab88a3d
commit 85e2a0cca0
3 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File

10
patcher/CommonPatcher
Unescape Escape View File

@ -131,9 +131,10 @@ mount_partitions () {
is_mounted /data || mount /data || error "failed to mount /data!"
mount -o bind /dev/urandom /dev/random
! is_mounted /system && mount -o rw /system
! is_mounted /system && mount -o rw ${SYSTEM_BLOCK} /system
! is_mounted /system && error "failed to mount /system!"
! is_mounted /system && mount -o rw /system_root
if [ -f /system/init.rc ]; then
SYSTEM_AS_ROOT=true
@ -148,10 +149,11 @@ mount_partitions () {
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
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
if [ -d /system/vendor ]; then
### XXX work-around required for some ROMs
if [[ ! $(is_mounted /vendor) && -a /system/vendor ]]; then
### XXX work-around required for some devices
VENDOR_COMPAT=TRUE
ln -sf /system/vendor /vendor >/dev/null
fi

65
systest/SysTest
Unescape Escape View File

@ -101,47 +101,66 @@ 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!"
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}"
${BOOTMODE} || mount -o bind /dev/urandom /dev/random
! is_mounted /system && mount -o rw /system
! is_mounted /system && mount -o rw ${SYSTEM_BLOCK} /system
! is_mounted /system && error "failed to mount /system!"
if ${BOOTMODE}; then
APEX_LD=/apex/com.android.runtime
build_props=$(find /system /system_root /vendor -type f -name build.prop)
if [ -f /system/init.rc ]; then
SYSTEM_AS_ROOT=true
[ -L /system_root ] && rm -f /system_root
mkdir /system_root 2>/dev/null
mount --move /system /system_root
mount -o bind /system_root/system /system
fi
if [[ ! $(is_mounted /vendor) && -a /system/vendor ]]; then
VENDOR_COMPAT=TRUE
fi
else
is_mounted /data || mount /data || error "failed to mount /data!"
vendor_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name vendor${SLOT} | head -n 1)
VENDOR_BLOCK=$(readlink -f ${vendor_tmp})
mount -o bind /dev/urandom /dev/random
! is_mounted /vendor && mount -o ro /vendor || mount -o ro ${VENDOR_BLOCK} /vendor
! is_mounted /system && mount -o rw /system
! is_mounted /system && mount -o rw ${SYSTEM_BLOCK} /system
! is_mounted /system && mount -o rw /system_root
if [ -d /system/vendor ]; then
### XXX work-around required for some ROMs
VENDOR_COMPAT=TRUE
ln -sf /system/vendor /vendor >/dev/null
fi
if [ -f /system/init.rc ]; then
SYSTEM_AS_ROOT=true
[ -L /system_root ] && rm -f /system_root
mkdir /system_root 2>/dev/null
mount --move /system /system_root
mount -o bind /system_root/system /system
fi
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
build_props=$(find /system /system_root /vendor -type f -name build.prop)
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
if [[ ! $(is_mounted /vendor) && -a /system/vendor ]]; then
### XXX work-around required for some devices
VENDOR_COMPAT=TRUE
ln -sf /system/vendor /vendor >/dev/null
fi
build_props=$(find /system /system_root /vendor -type f -name build.prop)
[ -d /system/apex ] && mount_apex
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
[ -d /system/apex ] && mount_apex
fi
}
umount_partitions () {

14
uninstaller/META-INF/com/google/android/update-binary
Unescape Escape View File

@ -200,9 +200,10 @@ mount_partitions () {
is_mounted /data || mount /data || error "failed to mount /data!"
mount -o bind /dev/urandom /dev/random
! is_mounted /system && mount -o rw /system
! is_mounted /system && mount -o rw ${SYSTEM_BLOCK} /system
! is_mounted /system && error "failed to mount /system!"
! is_mounted /system && mount -o rw /system_root
if [ -f /system/init.rc ]; then
SYSTEM_AS_ROOT=true
@ -217,22 +218,23 @@ mount_partitions () {
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
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
if [ -d /system/vendor ]; then
### XXX work-around required for some ROMs
if [[ ! $(is_mounted /vendor) && -a /system/vendor ]]; then
### XXX work-around required for some devices
VENDOR_COMPAT=TRUE
ln -sf /system/vendor /vendor >/dev/null
fi
echo " "
mount | awk '{print $1 " on " $3 " params: " $6}'
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)
build_props=$(find /system /system_root /vendor -type f -name build.prop)
echo " INFO: #9 [build_props] ${build_props}"
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"

Write Preview
Loading…
Cancel
Save