diff options
Diffstat (limited to 'partition.cpp')
| -rw-r--r-- | partition.cpp | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/partition.cpp b/partition.cpp index 354563466..fe2843cae 100644 --- a/partition.cpp +++ b/partition.cpp @@ -984,6 +984,14 @@ bool TWPartition::Is_Mounted(void) { return ret; } +bool TWPartition::Is_File_System_Writable(void) { + if (!Is_File_System(Current_File_System) || !Is_Mounted()) + return false; + + string test_path = Mount_Point + "/."; + return (access(test_path.c_str(), W_OK) == 0); +} + bool TWPartition::Mount(bool Display_Error) { int exfat_mounted = 0; unsigned long flags = Mount_Flags; @@ -1152,6 +1160,31 @@ bool TWPartition::UnMount(bool Display_Error) { } } +bool TWPartition::ReMount(bool Display_Error) { + if (UnMount(Display_Error)) + return Mount(Display_Error); + return false; +} + +bool TWPartition::ReMount_RW(bool Display_Error) { + // No need to remount if already mounted rw + if (Is_File_System_Writable()) + return true; + + bool ro = Mount_Read_Only; + int flags = Mount_Flags; + + Mount_Read_Only = false; + Mount_Flags &= ~MS_RDONLY; + + bool ret = ReMount(Display_Error); + + Mount_Read_Only = ro; + Mount_Flags = flags; + + return ret; +} + bool TWPartition::Wipe(string New_File_System) { bool wiped = false, update_crypt = false, recreate_media = true; int check; @@ -1611,8 +1644,12 @@ bool TWPartition::Wipe_Encryption() { close(fd); } } else { - string Command = "flash_image " + Crypto_Key_Location + " /dev/zero"; - TWFunc::Exec_Cmd(Command); + if (TWFunc::IOCTL_Get_Block_Size(Crypto_Key_Location.c_str()) >= 16384LLU) { + string Command = "dd of='" + Crypto_Key_Location + "' if=/dev/zero bs=16384 count=1"; + TWFunc::Exec_Cmd(Command); + } else { + LOGINFO("Crypto key location reports size < 16K so not wiping crypto footer.\n"); + } } if (Wipe(Fstab_File_System)) { Has_Data_Media = Save_Data_Media; @@ -2137,7 +2174,8 @@ bool TWPartition::Restore_Tar(string restore_folder, string Restore_File_System, TWFunc::GUI_Operation_Text(TW_RESTORE_TEXT, Backup_Display_Name, gui_parse_text("{@restoring_hdr}")); gui_msg(Msg("restoring=Restoring {1}...")(Backup_Display_Name)); - if (!Mount(true)) + // Remount as read/write as needed so we can restore the backup + if (!ReMount_RW(true)) return false; Full_FileName = restore_folder + "/" + Backup_FileName; @@ -2174,6 +2212,10 @@ bool TWPartition::Restore_Tar(string restore_folder, string Restore_File_System, } } #endif + if (Mount_Read_Only || Mount_Flags & MS_RDONLY) + // Remount as read only when restoration is complete + ReMount(true); + return ret; } |