Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 21:27:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop embedding magisk in magiskinit

Browse Source
This commit is contained in:
topjohnwu
2021-01-18 04:25:26 -08:00
parent 42278f12ff
commit 5a71998b4e
11 changed files with 140 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/boot_patch.sh
View File

@ -53,6 +53,8 @@ if [ -z $SOURCEDMODE ]; then
cd "`getdir "${BASH_SOURCE:-$0}"`"
# Load utility functions
. ./util_functions.sh
# Detect version and architecture
api_level_arch_detect
fi
BOOTIMAGE="$1"
@ -67,9 +69,6 @@ export KEEPFORCEENCRYPT
chmod -R 755 .
# Extract magisk if doesn't exist
[ -e magisk ] || ./magiskinit -x magisk magisk
#########
# Unpack
#########
@ -135,14 +134,24 @@ echo "KEEPFORCEENCRYPT=$KEEPFORCEENCRYPT" >> config
echo "RECOVERYMODE=$RECOVERYMODE" >> config
[ ! -z $SHA1 ] && echo "SHA1=$SHA1" >> config
# Compress to save precious ramdisk space
if $IS64BIT; then
./magiskboot compress=xz magisk64 magisk.xz
else
./magiskboot compress=xz magisk32 magisk.xz
fi
./magiskboot cpio ramdisk.cpio \
"add 750 init magiskinit" \
"mkdir 0750 overlay.d" \
"mkdir 0750 overlay.d/sbin" \
"add 750 overlay.d/sbin/magisk.xz magisk.xz" \
"patch" \
"backup ramdisk.cpio.orig" \
"mkdir 000 .backup" \
"add 000 .backup/.magisk config"
rm -f ramdisk.cpio.orig config
rm -f ramdisk.cpio.orig config magisk.xz
#################
# Binary Patches

14
scripts/emulator.sh
View File

@ -28,14 +28,8 @@ mount_sbin() {
if [ ! -f /system/build.prop ]; then
# Running on PC
cd "`dirname "$0"`/.."
adb push native/out/x86/busybox scripts/emulator.sh /data/local/tmp
emu_arch=`adb shell uname -m`
if [ "$emu_arch" = "x86_64" ]; then
adb push native/out/x86/magiskinit64 /data/local/tmp/magiskinit
else
adb push native/out/x86/magiskinit /data/local/tmp
fi
cd "$(dirname "$0")/.."
adb push native/out/x86/busybox scripts/emulator.sh native/out/x86/magiskinit native/out/x86_64/magisk /data/local/tmp
adb shell sh /data/local/tmp/emulator.sh
exit 0
fi
@ -43,7 +37,7 @@ fi
cd /data/local/tmp
chmod 777 busybox
chmod 777 magiskinit
./magiskinit -x magisk magisk
chmod 777 magisk
if [ -z "$FIRST_STAGE" ]; then
export FIRST_STAGE=1
@ -113,7 +107,7 @@ else
fi
# Magisk stuffs
./magiskinit -x magisk $BINDIR/magisk
cp -af ./magisk $BINDIR/magisk
chmod 755 $BINDIR/magisk
ln -s ./magisk $BINDIR/su
ln -s ./magisk $BINDIR/resetprop

6
scripts/util_functions.sh
View File

@ -445,12 +445,6 @@ install_magisk() {
$BOOTSIGNED && ui_print "- Boot image is signed with AVB 1.0"
fi
if $IS64BIT; then
mv -f magiskinit64 magiskinit 2>/dev/null
else
rm -f magiskinit64
fi
# Source the boot patcher
SOURCEDMODE=true
. ./boot_patch.sh "$BOOTIMAGE"