From 7668e458904d9cbac591e5a213c749f38b5ea6e6 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Tue, 17 Dec 2019 17:15:31 -0500 Subject: [PATCH] Cleanup legacy code --- native/jni/core/bootstages.cpp | 5 ----- native/jni/core/scripting.cpp | 27 --------------------------- native/jni/include/daemon.h | 1 - 3 files changed, 33 deletions(-) diff --git a/native/jni/core/bootstages.cpp b/native/jni/core/bootstages.cpp index c0424a2ea..71a37ba45 100644 --- a/native/jni/core/bootstages.cpp +++ b/native/jni/core/bootstages.cpp @@ -413,11 +413,6 @@ static bool magisk_env() { } static void prepare_modules() { - const char *legacy_imgs[] = {SECURE_DIR "/magisk.img", SECURE_DIR "/magisk_merge.img"}; - for (auto img : legacy_imgs) { - if (access(img, F_OK) == 0) - migrate_img(img); - } DIR *dir; struct dirent *entry; if ((dir = opendir(MODULEUPGRADE))) { diff --git a/native/jni/core/scripting.cpp b/native/jni/core/scripting.cpp index 070e9c3d2..5e4899847 100644 --- a/native/jni/core/scripting.cpp +++ b/native/jni/core/scripting.cpp @@ -72,33 +72,6 @@ void exec_module_script(const char *stage, const vector &module_list) { } } -constexpr char migrate_script[] = -"MODULEROOT=" MODULEROOT R"EOF( -IMG=%s -MNT=/dev/img_mnt -e2fsck -yf $IMG -mkdir -p $MNT -for num in 0 1 2 3 4 5 6 7; do - losetup /dev/block/loop${num} $IMG || continue - mount -t ext4 /dev/block/loop${num} $MNT - rm -rf $MNT/lost+found $MNT/.core - magisk --clone $MNT $MODULEROOT - umount $MNT - rm -rf $MNT - losetup -d /dev/block/loop${num} - break -done -rm -rf $IMG -)EOF"; - -void migrate_img(const char *img) { - LOGI("* Migrating %s\n", img); - exec_t exec { .pre_exec = set_path }; - char cmds[sizeof(migrate_script) + 128]; - sprintf(cmds, migrate_script, img); - exec_command_sync(exec, "/system/bin/sh", "-c", cmds); -} - constexpr char install_script[] = R"EOF( APK=%s log -t Magisk "apk_install: $APK" diff --git a/native/jni/include/daemon.h b/native/jni/include/daemon.h index 71ac92b9b..c346a809e 100644 --- a/native/jni/include/daemon.h +++ b/native/jni/include/daemon.h @@ -68,7 +68,6 @@ void remove_modules(); void exec_script(const char *script); void exec_common_script(const char *stage); void exec_module_script(const char *stage, const std::vector &module_list); -void migrate_img(const char *img); void install_apk(const char *apk); /**************