Switch multirom directory to /data/media/MultiROM

FBE devices leave this directory unencrypted and this saves us a lot of
hassle of decrypting and rebooting the phone

Author: vasishath

install_zip/prebuilt-installer/scripts/extract_multirom.sh

@@ -9,6 +9,9 @@ if [ -d "/data/media/multirom" ] && [ ! -d "/data/media/MultiROM/multirom" ]; th
 elif [ -d "/data/media/0/multirom" ] && [ ! -d "/data/media/0/MultiROM/multirom" ]; then
     mkdir "/data/media/0/MultiROM"
     mv "/data/media/0/multirom" "/data/media/0/MultiROM/multirom"
+elif [ -d "/data/media/0/MultiROM/multirom" ] && [ ! -d "/data/media/MultiROM/multirom" ]; then
+    mkdir "/data/media/MultiROM"
+    mv "/data/media/0/MultiROM/multirom" "/data/media/MultiROM/multirom"
 fi
 
 # Check for existing dirs otherwise create them
@@ -19,13 +22,8 @@ elif [ -d "/data/media/0/MultiROM/multirom" ] ; then
     cont="/data/media/0/MultiROM"
     base="/data/media/0/MultiROM/multirom"
 else
-    if [ -d "/data/media/0" ] ; then
-        cont="/data/media/0/MultiROM"
-        base="/data/media/0/MultiROM/multirom"
-    else
-        cont="/data/media/MultiROM"
-        base="/data/media/MultiROM/multirom"
-    fi
+    cont="/data/media/MultiROM"
+    base="/data/media/MultiROM/multirom"
 
     mkdir "$cont"
     chown root:root "$cont"

multirom.c

@@ -1521,7 +1521,7 @@ struct multirom_rom *multirom_get_rom_by_id(struct multirom_status *s, int id)
 
 int multirom_prepare_for_boot(struct multirom_status *s, struct multirom_rom *to_boot, int always_reboot)
 {
-    int exit = always_reboot ? (EXIT_REBOOT | EXIT_UMOUNT) : EXIT_UMOUNT;
+    int exit = EXIT_UMOUNT;
     int type = to_boot->type;
 
 

trampoline/trampoline.cpp

@@ -247,8 +247,13 @@ static int try_mount_all_entries(struct fstab *fstab, struct fstab_part *first_d
             if(stat("/realdata/unencrypted/key/version", &info) < 0) {
                 return 0;
             } else {
-                INFO("File system is FBE encrypted");
-                return -2;
+                if (!mrom_is_second_boot() && stat("/realdata/media/MultiROM/multirom", &info) >= 0) {
+                    INFO("Multirom found");
+                    return 0;
+                } else {
+                    INFO("File system is FBE encrypted");
+                    return -2;
+                }
             }
         }
     }
@@ -273,8 +278,13 @@ static int try_mount_all_entries(struct fstab *fstab, struct fstab_part *first_d
             if(stat("/realdata/unencrypted/key/version", &info) < 0) {
                 return 0;
             } else {
-                INFO("File system is FBE encrypted\n");
-                return -2;
+                if (!mrom_is_second_boot() && stat("/realdata/media/MultiROM/multirom", &info) >= 0) {
+                    INFO("Multirom found");
+                    return 0;
+                } else {
+                    INFO("File system is FBE encrypted\n");
+                    return -2;
+                }
             }
             return 0;
         }
@@ -426,7 +436,8 @@ static void switch_root(const char* path) {
             }
 
             for (auto i : v) {
-                if (!strncmp(mentry.mnt_dir, i.data(), i.length())) {
+                if (!strcmp(mentry.mnt_dir, i.data())) {
+                    INFO("%s %s %d not adding to vector\n", mentry.mnt_dir, i.data(), i.length());
                     add = false;
                     break;
                 } else {
@@ -482,6 +493,17 @@ static int do_cmdline(int argc, char *argv[])
         } else {
             INFO("chroot returned %d\n", error);
         }
+        struct stat info;
+        if(stat("/system/etc/selinux", &info) < 0) {
+            INFO("/system/etc/selinux does not exist!\n");
+        } else {
+            INFO("/system/etc/selinux exists\n");
+        }
+        if (stat("/vendor/etc/selinux", &info) < 0) {
+            INFO("/vendor/etc/selinux does not exist!\n");
+        } else {
+            INFO("/vendor/etc/selinux exists\n");
+        }
         int res;
         static char *const cmd[] = { "/init", "selinux_setup", NULL };
         res = execv(cmd[0], cmd);