From 43acadf10e7a58f70e0c0ddff6a5d95374b27c9c Mon Sep 17 00:00:00 2001 From: Gary Peck Date: Wed, 21 Nov 2012 21:19:01 -0800 Subject: restore based on backup type, not destination type Change-Id: Ie44958a148d00cadd2ba3c51255f7fd9d8a651e7 --- partitions.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'partitions.hpp') diff --git a/partitions.hpp b/partitions.hpp index 83e924323..a74a5a459 100644 --- a/partitions.hpp +++ b/partitions.hpp @@ -49,6 +49,7 @@ public: virtual bool Is_Mounted(); // Checks mount to see if the partition is currently mounted virtual bool Mount(bool Display_Error); // Mounts the partition if it is not mounted virtual bool UnMount(bool Display_Error); // Unmounts the partition if it is mounted + virtual bool Wipe(string New_File_System); // Wipes the partition virtual bool Wipe(); // Wipes the partition virtual bool Wipe_AndSec(); // Wipes android secure virtual bool Backup(string backup_folder); // Backs up the partition to the folder specified @@ -116,7 +117,7 @@ private: void Find_Real_Block_Device(string& Block_Device, bool Display_Error); // Checks the block device given and follows symlinks until it gets to the real block device bool Find_Partition_Size(); // Finds the partition size from /proc/partitions unsigned long long Get_Size_Via_du(string Path, bool Display_Error); // Uses du to get sizes - bool Wipe_EXT23(); // Formats as ext3 or ext2 + bool Wipe_EXT23(string File_System); // Formats as ext3 or ext2 bool Wipe_EXT4(); // Formats using ext4, uses make_ext4fs when present bool Wipe_FAT(); // Formats as FAT except that mkdosfs from busybox usually fails so oftentimes this is actually a rm -rf wipe bool Wipe_MTD(); // Formats as yaffs2 for MTD memory types @@ -125,7 +126,7 @@ private: bool Backup_Tar(string backup_folder); // Backs up using tar for file systems bool Backup_DD(string backup_folder); // Backs up using dd for emmc memory types bool Backup_Dump_Image(string backup_folder); // Backs up using dump_image for MTD memory types - bool Restore_Tar(string restore_folder); // Restore using tar for file systems + bool Restore_Tar(string restore_folder, string Restore_File_System); // Restore using tar for file systems bool Restore_DD(string restore_folder); // Restore using dd for emmc memory types bool Restore_Flash_Image(string restore_folder); // Restore using flash_image for MTD memory types bool Get_Size_Via_statfs(bool Display_Error); // Get Partition size, used, and free space using statfs -- cgit v1.2.3