Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

improve system-as-root support; syntax fix for mounting /vendor

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2020-10-05 19:56:26 +02:00
parent f7b2f8c7a1
commit 0929f4477a
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CommonInstaller
View File

@ -250,6 +250,11 @@ mount_partitions () {
SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
if [ -d /system_root -o ${SYSTEM_AS_ROOT} ]; then
[ -L /system_root ] && mv /system_root /system_root_link
if [ ! -d /system_root ]; then
rm -rf /system_root
mkdir -p /system_root
fi
! is_mounted /system_root && mount -o rw /system_root
! is_mounted /system_root && mount -o rw ${SYSTEM_BLOCK} /system_root
mount -o bind /system_root/system /system
@ -264,7 +269,7 @@ mount_partitions () {
echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
! is_mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
if [[ ! $(is_mounted /vendor) && -d /system/vendor ]]; then
### XXX work-around required for some devices

7
patcher/CommonPatcher
View File

@ -134,6 +134,11 @@ mount_partitions () {
SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
if [ -d /system_root -o ${SYSTEM_AS_ROOT} ]; then
[ -L /system_root ] && mv /system_root /system_root_link
if [ ! -d /system_root ]; then
rm -rf /system_root
mkdir -p /system_root
fi
! is_mounted /system_root && mount -o rw /system_root
! is_mounted /system_root && mount -o rw ${SYSTEM_BLOCK} /system_root
mount -o bind /system_root/system /system
@ -148,7 +153,7 @@ mount_partitions () {
echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
! is_mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
if [[ ! $(is_mounted /vendor) && -d /system/vendor ]]; then
### XXX work-around required for some devices

7
systest/SysTest
View File

@ -131,6 +131,11 @@ mount_partitions () {
SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
if [ -d /system_root -o ${SYSTEM_AS_ROOT} ]; then
[ -L /system_root ] && mv /system_root /system_root_link
if [ ! -d /system_root ]; then
rm -rf /system_root
mkdir -p /system_root
fi
! is_mounted /system_root && mount -o rw /system_root
! is_mounted /system_root && mount -o rw ${SYSTEM_BLOCK} /system_root
mount -o bind /system_root/system /system
@ -140,7 +145,7 @@ mount_partitions () {
fi
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
! is_mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
if [[ ! $(is_mounted /vendor) && -d /system/vendor ]]; then
### XXX work-around required for some devices

7
uninstaller/META-INF/com/google/android/update-binary
View File

@ -198,6 +198,11 @@ mount_partitions () {
SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
if [ -d /system_root -o ${SYSTEM_AS_ROOT} ]; then
[ -L /system_root ] && mv /system_root /system_root_link
if [ ! -d /system_root ]; then
rm -rf /system_root
mkdir -p /system_root
fi
! is_mounted /system_root && mount -o rw /system_root
! is_mounted /system_root && mount -o rw ${SYSTEM_BLOCK} /system_root
mount -o bind /system_root/system /system
@ -212,7 +217,7 @@ mount_partitions () {
echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
! is_mounted /vendor && mount -o ro /vendor
! is mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
! is_mounted /vendor && mount -o ro ${VENDOR_BLOCK} /vendor
if [[ ! $(is_mounted /vendor) && -d /system/vendor ]]; then
### XXX work-around required for some devices