Android/vendor_gapps
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite mounting

Browse Source 
* Support dynamic partitions
* Mount system at /mnt/system to not interfere with newer recoveries
* Android 10+ system images always contain a rootfs before system
* Don't use system toybox
This commit is contained in:
Alessandro Astone
2020-12-26 16:42:26 +01:00
parent 7febfbe606
commit 94437f53f2
1 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
build/meta/com/google/android/update-binary
View File

@@ -3,21 +3,17 @@
OUTFD="/proc/self/fd/$2" OUTFD="/proc/self/fd/$2"
ZIP=$3 ZIP=$3
exec_util() {
LD_LIBRARY_PATH=$LD_PATH $UTILS $1
}
set_con() { set_con() {
exec_util "chcon -h u:object_r:"$1":s0 $2" chcon -h u:object_r:"$1":s0 $2
exec_util "chcon u:object_r:"$1":s0 $2" chcon u:object_r:"$1":s0 $2
} }
set_perm() { set_perm() {
exec_util "chmod $1 $2" chmod $1 $2
} }
set_owner() { set_owner() {
exec_util "chown $1:$2 $3" chown $1:$2 $3
} }
ui_print() { ui_print() {
@@ -25,129 +21,150 @@ ui_print() {
echo "ui_print" > "$OUTFD"; echo "ui_print" > "$OUTFD";
} }
cleanup() {
ui_print "Cleaning up files"
cd ../
rm -rf system
ui_print "Unmounting partitions"
umount -l "$SYSTEM_MNT"
}
get_block_for_mount_point() {
grep -v "^#" /etc/recovery.fstab | grep " $1 " | tail -n1 | tr -s ' ' | cut -d' ' -f1
}
find_block() {
local name="$1"
local fstab_entry=$(get_block_for_mount_point "/$name")
# P-SAR hacks
[ -z "$fstab_entry" ] && [ "$name" = "system" ] && fstab_entry=$(get_block_for_mount_point "/")
[ -z "$fstab_entry" ] && [ "$name" = "system" ] && fstab_entry=$(get_block_for_mount_point "/system_root")
local dev
if [ "$DYNAMIC_PARTITIONS" = "true" ]; then
if [ -n "$fstab_entry" ]; then
dev="${BLK_PATH}/${fstab_entry}${SLOT_SUFFIX}"
else
dev="${BLK_PATH}/${name}${SLOT_SUFFIX}"
fi
else
if [ -n "$fstab_entry" ]; then
dev="${fstab_entry}${SLOT_SUFFIX}"
else
dev="${BLK_PATH}/${name}${SLOT_SUFFIX}"
fi
fi
if [ -b "$dev" ]; then
echo "$dev"
fi
}
ui_print "**********************" ui_print "**********************"
ui_print "MindTheGapps installer" ui_print "MindTheGapps installer"
ui_print "**********************" ui_print "**********************"
SYSTEMASROOT=`getprop ro.build.system_root_image` ui_print "Mounting partitions"
ui_print "Mounting system partition"
# Ensure system is unmounted so mounting succeeds # Ensure system is unmounted so mounting succeeds
umount /system || true umount /system || umount /mnt/system || true
if [ "$SYSTEMASROOT" == "true" ]; then # Find partitions
CURRENTSLOT=`getprop ro.boot.slot_suffix` DYNAMIC_PARTITIONS=`getprop ro.boot.dynamic_partitions`
if [ ! -z "$CURRENTSLOT" ]; then if [ "$DYNAMIC_PARTITIONS" = "true" ]; then
if [ "$CURRENTSLOT" == "_a" ]; then BLK_PATH="/dev/block/mapper"
TARGETSYSTEM=/dev/block/bootdevice/by-name/system_a
else
TARGETSYSTEM=/dev/block/bootdevice/by-name/system_b
fi
else
TARGETSYSTEM=/dev/block/bootdevice/by-name/system
fi
mkdir -p /system_root
if mount -o rw $TARGETSYSTEM /system_root && mount -o bind /system_root/system /system; then
ui_print "/system mounted"
else
ui_print "Could not mount /system! Aborting"
exit 1
fi
else else
if mount /system; then BLK_PATH=/dev/block/bootdevice/by-name
ui_print "/system mounted" fi
CURRENTSLOT=`getprop ro.boot.slot_suffix`
if [ ! -z "$CURRENTSLOT" ]; then
if [ "$CURRENTSLOT" == "_a" ]; then
SLOT_SUFFIX="_a"
else else
ui_print "Could not mount /system! Aborting" SLOT_SUFFIX="_b"
exit 1
fi fi
fi fi
if [ -f /system/bin/toybox ]; then SYSTEM_BLOCK=$(find_block "system")
UTILS=/system/bin/toybox
LD_PATH=/system/lib # Disable rw protection on dynamic partitions
if [ "$DYNAMIC_PARTITIONS" = "true" ]; then
blockdev --setrw "$SYSTEM_BLOCK"
fi
# Mount and define SYSTEM_OUT
SYSTEM_MNT=/mnt/system
mkdir -p "$SYSTEM_MNT" || true
if mount -o rw "$SYSTEM_BLOCK" "$SYSTEM_MNT"; then
ui_print "$SYSTEM_MNT mounted"
else else
ui_print "Could not find /system/bin/toybox! Aborting" ui_print "Could not mount $SYSTEM_MNT! Aborting"
exit 1 exit 1
fi
DIRS="addon.d app priv-app framework etc lib"
if [ -d /system/lib64 ]; then
DIRS="$DIRS lib64"
LD_PATH=/system/lib64
fi fi
SYSTEM_OUT="${SYSTEM_MNT}/system"
LOWMEM=1572864 LOWMEM=1572864
MEM=`grep MemTotal /proc/meminfo | awk '{ print $2 }'` MEM=`grep MemTotal /proc/meminfo | awk '{ print $2 }'`
STORAGE=`exec_util "df /system" | grep -v Filesystem | awk '{ print $4 }'` STORAGE=`df $SYSTEM_MNT | grep -v Filesystem | awk '{ print $4 }'`
STORAGE_BUFFER=10240 STORAGE_BUFFER=10240
ui_print "Extracting files" ui_print "Extracting files"
cd /tmp cd /tmp
unzip -o "$ZIP" unzip -o "$ZIP"
exec_util "rm -rf META-INF" rm -rf META-INF
cd system cd system
NEEDED_STORAGE=`expr $(exec_util "du -s ." | awk '{ print $1 }') + $STORAGE_BUFFER` NEEDED_STORAGE=`expr $(du -s . | awk '{ print $1 }') + $STORAGE_BUFFER`
if [ "$MEM" -lt "$LOWMEM" ] || [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then if [ "$MEM" -lt "$LOWMEM" ] || [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then
ui_print "Low resource device detected, removing large extras" ui_print "Low resource device detected, removing large extras"
exec_util "rm -rf app/MarkupGoogle" rm -rf app/MarkupGoogle
exec_util "rm -rf priv-app/AndroidMigratePrebuilt" rm -rf priv-app/AndroidMigratePrebuilt
exec_util "rm -rf priv-app/SetupWizard" rm -rf priv-app/SetupWizard
exec_util "rm -rf priv-app/Velvet" rm -rf priv-app/Velvet
NEEDED_STORAGE=`expr $(exec_util "du -s ." | awk '{ print $1 }') + $STORAGE_BUFFER` NEEDED_STORAGE=`expr $(du -s . | awk '{ print $1 }') + $STORAGE_BUFFER`
if [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then if [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then
ui_print "Not enough space for GApps! Aborting" ui_print "Not enough space for GApps! Aborting"
cd .. cd ..
exec_util "rm -rf system" rm -rf system
exit 1 exit 1
fi fi
fi fi
ui_print "Generating addon.d file" ui_print "Generating addon.d file"
cat addon.d/addond_head > addon.d/30-gapps.sh cat addon.d/addond_head > addon.d/30-gapps.sh
for f in `exec_util "find . -type f"`; do for f in `find . -type f`; do
line=$(echo "$f" | sed 's/\.\///') line=$(echo "$f" | sed 's/\.\///')
echo "$line" >> addon.d/30-gapps.sh echo "$line" >> addon.d/30-gapps.sh
done done
cat addon.d/addond_tail >> addon.d/30-gapps.sh cat addon.d/addond_tail >> addon.d/30-gapps.sh
rm addon.d/addond_head addon.d/addond_tail rm addon.d/addond_head addon.d/addond_tail
ui_print "Preparing files for copying" ui_print "Preparing files for copying"
for dirs in $DIRS; do for d in `find . -mindepth 1 -type d -type d`; do
set_perm 0755 $dir set_perm 0755 $d
for d in `exec_util "find ./$dir -type d"`; do set_owner root root $d
set_perm 0755 $d done
set_owner root root $d for f in `find . -type f`; do
done type=$(echo "$f" | sed 's/.*\.//')
for f in `exec_util "find ./$dir -type f"`; do if [ "$type" == "sh" ] || [ "$type" == "$f" ]; then
type=$(echo "$f" | sed 's/.*\.//') set_perm 0755 $f
if [ "$type" == "sh" ] || [ "$type" == "$f" ]; then else
set_perm 0755 $f set_perm 0644 $f
else fi
set_perm 0644 $f set_owner root root $f
fi set_con system_file $f
set_owner root root $f
set_con system_file $f
done
done done
ui_print "Copying files" ui_print "Copying files"
exec_util "cp --preserve=a -r ./* /system/" cp --preserve=a -r ./* "${SYSTEM_OUT}/"
if [ -e priv-app/SetupWizard ] ; then if [ -e priv-app/SetupWizard ] ; then
exec_util "rm -rf /system/priv-app/Provision" rm -rf "${SYSTEM_OUT}/priv-app/Provision"
fi fi
ui_print "Cleaning up files"
cd ../
exec_util "rm -rf system"
ui_print "Unmounting system partition" cleanup
if umount -l /system; then
if [ "$SYSTEMASROOT" == "true" ]; then
umount -l /system_root
fi
fi
ui_print "Done!" ui_print "Done!"
exit 0 exit 0