android/vendor_gapps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from invisiblek/master

Browse Source 
fix system-as-root and umounting
This commit is contained in:
Paul Keith 2018-03-19 14:20:53 -05:00 committed by GitHub
commit 8f994c4ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addond_head
View File

@ -1,5 +1,7 @@
#!/sbin/sh
#
# ADDOND_VERSION=2
#
# /system/addon.d/30-gapps.sh
#
. /tmp/backuptool.functions

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

@ -29,38 +29,50 @@ ui_print "**********************"
ui_print "MindTheGapps installer"
ui_print "**********************"
ABDEVICE=`getprop ro.build.system_root_image`
SYSTEMASROOT=`getprop ro.build.system_root_image`
ui_print "Mounting system partition"
if [ "$ABDEVICE" == "true" ]; then
SYSTEM="/system/system"
# TODO: Actually handle A/B ota devices
ui_print "A/B OTA device detected! This is unsupported. Aborting"
exit 1
else
SYSTEM="/system"
if mount $SYSTEM; then
ui_print "$SYSTEM mounted"
if [ "$SYSTEMASROOT" == "true" ]; then
CURRENTSLOT=`getprop ro.boot.slot_suffix`
if [ ! -z "$CURRENTSLOT" ]; then
if [ "$CURRENTSLOT" == "_a" ]; then
TARGETSYSTEM=/dev/block/bootdevice/by-name/system_b
else
TARGETSYSTEM=/dev/block/bootdevice/by-name/system_a
fi
else
ui_print "Could not mount $SYSTEM! Aborting"
exit 1
TARGETSYSTEM=/dev/block/bootdevice/by-name/system
fi
mkdir -p /system_root
if mount -o rw $TARGETSYSTEM /system_root && mount /system_root/system /system; then
ui_print "/system mounted"
else
ui_print "Could not mount /system! Aborting"
exit 1
fi
else
if mount /system; then
ui_print "/system mounted"
else
ui_print "Could not mount /system! Aborting"
exit 1
fi
fi
if [ -f $SYSTEM/bin/toybox ]; then
UTILS=$SYSTEM/bin/toybox
LD_PATH=$SYSTEM/lib
if [ -f /system/bin/toybox ]; then
UTILS=/system/bin/toybox
LD_PATH=/system/lib
else
ui_print "Could not find $SYSTEM/bin/toybox! Aborting"
ui_print "Could not find /system/bin/toybox! Aborting"
exit 1
fi
DIRS="addon.d app priv-app framework etc lib"
if [ -d $SYSTEM/lib64 ]; then
if [ -d /system/lib64 ]; then
DIRS="$DIRS lib64"
LD_PATH=$SYSTEM/lib64
LD_PATH=/system/lib64
fi
LOWMEM=1572864
@ -84,6 +96,7 @@ for f in `exec_util "find . -type f"`; do
echo "$line" >> addon.d/30-gapps.sh
done
cat addon.d/addond_tail >> addon.d/30-gapps.sh
rm addon.d/addond_head addon.d/addond_tail
ui_print "Preparing files for copying"
for dirs in $DIRS; do
set_perm 0755 $dir
@ -103,14 +116,18 @@ for dirs in $DIRS; do
done
done
ui_print "Copying files"
exec_util "cp --preserve=a -r ./* $SYSTEM/"
exec_util "rm -rf $SYSTEM/priv-app/Provision/"
exec_util "cp --preserve=a -r ./* /system/"
exec_util "rm -rf /system/priv-app/Provision/"
ui_print "Cleaning up files"
cd ../
exec_util "rm -rf system/"
ui_print "Unmounting system partition"
umount $SYSTEM
if umount -l /system; then
if [ "$SYSTEMASROOT" == "true" ]; then
umount -l /system_root
fi
fi
ui_print "Done!"
exit 0