Updated remounter to properly remount on Lineage OS (And possibly oth…

…ers)
Stericson · Nov 26, 2017 · fa881ec · fa881ec
1 parent 1025787
commit fa881ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/com/stericson/RootTools/Constants.java b/src/main/java/com/stericson/RootTools/Constants.java
@@ -2,7 +2,7 @@
 
 public class Constants
 {
-    public static final String TAG = "RootTools v4.6";
+    public static final String TAG = "RootTools v5.0";
     public static final int FPS = 1;
     public static final int BBA = 3;
     public static final int BBV = 4;

diff --git a/src/main/java/com/stericson/RootTools/internal/Remounter.java b/src/main/java/com/stericson/RootTools/internal/Remounter.java
@@ -120,14 +120,20 @@ public boolean remount(String file, String mountType)
                             true,
                             "busybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
                             "busybox mount -o remount," + mountType.toLowerCase() + " " + file,
+                            "busybox mount -o " + mountType.toLowerCase() + ",remount " + mountPoint.getDevice().getAbsolutePath(),
+                            "busybox mount -o " + mountType.toLowerCase() + ",remount " + file,
                             "toolbox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
                             "toolbox mount -o remount," + mountType.toLowerCase() + " " + file,                             "toybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
+                            "toolbox mount -o " + mountType.toLowerCase() + ",remount " + mountPoint.getDevice().getAbsolutePath(),
+                            "toolbox mount -o " + mountType.toLowerCase() + ",remount " + file,
                             "mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
                             "mount -o remount," + mountType.toLowerCase() + " " + file,
-                            "/system/bin/toolbox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
-                            "/system/bin/toolbox mount -o remount," + mountType.toLowerCase() + " " + file,
-                            "/system/bin/toybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
-                            "/system/bin/toybox mount -o remount," + mountType.toLowerCase() + " " + file);
+                            "mount -o " + mountType.toLowerCase() + ",remount " + mountPoint.getDevice().getAbsolutePath(),
+                            "mount -o " + mountType.toLowerCase() + ",remount " + file,
+                            "toybox mount -o remount," + mountType.toLowerCase() + " " + mountPoint.getDevice().getAbsolutePath() + " " + mountPoint.getMountPoint().getAbsolutePath(),
+                            "toybox mount -o remount," + mountType.toLowerCase() + " " + file,
+                            "toybox mount -o " + mountType.toLowerCase() + ",remount " + mountPoint.getDevice().getAbsolutePath(),
+                            "toybox mount -o " + mountType.toLowerCase() + ",remount " + file);
                     Shell.startRootShell().add(command);
                     commandWait(command);