summaryrefslogtreecommitdiffstats
path: root/partition.cpp
diff options
context:
space:
mode:
authorCaptain Throwback <captainthrowback@gmail.com>2018-07-27 16:05:24 +0200
committerCaptain Throwback <captainthrowback@hotmail.com>2018-08-24 18:47:45 +0200
commit9d6feb53115e2dcc49a644400da4d62a16c1c3c6 (patch)
treec5d5778cd617d8d60231cebf87f16527a7f47313 /partition.cpp
parentMerge AOSP android-9.0.0_r3 (diff)
downloadandroid_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar
android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.gz
android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.bz2
android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.lz
android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.xz
android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.zst
android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.zip
Diffstat (limited to 'partition.cpp')
-rw-r--r--partition.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/partition.cpp b/partition.cpp
index 0272708cd..15fc4e307 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -431,7 +431,7 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
} else if (Is_File_System(Fstab_File_System)) {
Find_Actual_Block_Device();
Setup_File_System(Display_Error);
- if (Mount_Point == "/system") {
+ if (Mount_Point == PartitionManager.Get_Android_Root_Path()) {
Display_Name = "System";
Backup_Display_Name = Display_Name;
Storage_Name = Display_Name;
@@ -1487,7 +1487,7 @@ bool TWPartition::UnMount(bool Display_Error) {
int never_unmount_system;
DataManager::GetValue(TW_DONT_UNMOUNT_SYSTEM, never_unmount_system);
- if (never_unmount_system == 1 && Mount_Point == "/system")
+ if (never_unmount_system == 1 && Mount_Point == PartitionManager.Get_Android_Root_Path())
return true; // Never unmount system if you're not supposed to unmount it
if (Is_Storage && MTP_Storage_ID > 0)
@@ -2607,7 +2607,7 @@ bool TWPartition::Restore_Tar(PartitionSettings *part_settings) {
ret = true;
#ifdef HAVE_CAPABILITIES
// Restore capabilities to the run-as binary
- if (Mount_Point == "/system" && Mount(true) && TWFunc::Path_Exists("/system/bin/run-as")) {
+ if (Mount_Point == PartitionManager.Get_Android_Root_Path() && Mount(true) && TWFunc::Path_Exists("/system/bin/run-as")) {
struct vfs_cap_data cap_data;
uint64_t capabilities = (1 << CAP_SETUID) | (1 << CAP_SETGID);