From 47952490a6fcf0ef4ffeb3da49f5038e4cb70417 Mon Sep 17 00:00:00 2001
From: Tony George <tony.george.kol@gmail.com>
Date: Sat, 14 Jan 2017 19:42:36 +0530
Subject: [PATCH] BTRFS: Fixed an issue with offline restore when @home is on a
 separate device

---
 src/Core/SnapshotRepo.vala |   7 ++-
 timeshift.pot              | 120 ++++++++++++++++++-------------------
 2 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/src/Core/SnapshotRepo.vala b/src/Core/SnapshotRepo.vala
index 1a6d033..1e0678e 100644
--- a/src/Core/SnapshotRepo.vala
+++ b/src/Core/SnapshotRepo.vala
@@ -170,14 +170,17 @@ public class SnapshotRepo : GLib.Object{
 		if (btrfs_mode){
 			mount_paths["@"] = mount_path;
 			mount_paths["@home"] = mount_path; //default
-
+			device_home = device; //default
+			
 			// mount @home if on different disk -------
 		
 			var repo_subvolumes = Subvolume.detect_subvolumes_for_system_by_path(path_combine(mount_path,"@"), parent_window);
 			if (repo_subvolumes.has_key("@home")){
 				var subvol = repo_subvolumes["@home"];
 				if (subvol.device_uuid != device.uuid){
-					mount_paths["@home"] = unlock_and_mount_device(subvol.get_device(), "/mnt/timeshift/backup-home");
+					// @home is on a separate device
+					device_home = subvol.get_device();
+					mount_paths["@home"] = unlock_and_mount_device(device_home, "/mnt/timeshift/backup-home");
 					if (mount_paths["@home"].length == 0){
 						return false;
 					}
diff --git a/timeshift.pot b/timeshift.pot
index 1770166..050c67e 100644
--- a/timeshift.pot
+++ b/timeshift.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: timeshift 1.6\n"
 "Report-Msgid-Bugs-To: teejeetech@gmail.com\n"
-"POT-Creation-Date: 2017-01-14 18:42+0530\n"
+"POT-Creation-Date: 2017-01-14 19:41+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgid ""
 "Press ENTER to continue..."
 msgstr ""
 
-#: Core/SnapshotRepo.vala:588
+#: Core/SnapshotRepo.vala:590
 #, c-format
 msgid "%d snapshots, %s free"
 msgstr ""
@@ -54,19 +54,19 @@ msgstr ""
 msgid "** Uninstalled Timeshift BTRFS **"
 msgstr ""
 
-#: Core/Main.vala:3064
+#: Core/Main.vala:3071
 msgid "/ is mapped to device"
 msgstr ""
 
-#: Core/Main.vala:3086
+#: Core/Main.vala:3093
 msgid "/boot is mapped to device"
 msgstr ""
 
-#: Core/Main.vala:3097
+#: Core/Main.vala:3104
 msgid "/boot/efi is mapped to device"
 msgstr ""
 
-#: Core/Main.vala:3075
+#: Core/Main.vala:3082
 msgid "/home is mapped to device"
 msgstr ""
 
@@ -179,11 +179,11 @@ msgstr ""
 msgid "Answer YES to all confirmation prompts"
 msgstr ""
 
-#: Core/Main.vala:2922
+#: Core/Main.vala:2929
 msgid "App config loaded"
 msgstr ""
 
-#: Core/Main.vala:2824
+#: Core/Main.vala:2831
 msgid "App config saved"
 msgstr ""
 
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Application needs admin access."
 msgstr ""
 
-#: Core/Main.vala:3239
+#: Core/Main.vala:3246
 msgid "Application will exit"
 msgstr ""
 
@@ -430,11 +430,11 @@ msgstr ""
 msgid "Could not find snapshot"
 msgstr ""
 
-#: Core/Main.vala:2703
+#: Core/Main.vala:2705
 msgid "Could not find system subvolume"
 msgstr ""
 
-#: Core/Main.vala:2726
+#: Core/Main.vala:2733
 msgid "Could not find system subvolumes for creating pre-restore snapshot"
 msgstr ""
 
@@ -504,7 +504,7 @@ msgstr ""
 msgid "Created directory"
 msgstr ""
 
-#: Core/Main.vala:2748
+#: Core/Main.vala:2755
 msgid "Created pre-restore snapshot"
 msgstr ""
 
@@ -532,7 +532,7 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
-#: Core/Main.vala:3238
+#: Core/Main.vala:3245
 msgid "Critical Error"
 msgstr ""
 
@@ -623,8 +623,8 @@ msgstr ""
 
 #: Console/AppConsole.vala:445 Console/AppConsole.vala:484
 #: Console/AppConsole.vala:532 Core/Main.vala:1885 Core/Main.vala:1913
-#: Core/SnapshotRepo.vala:49 Core/SnapshotRepo.vala:630
-#: Core/SnapshotRepo.vala:633 Utility/Device.vala:1742 Utility/Device.vala:1752
+#: Core/SnapshotRepo.vala:49 Core/SnapshotRepo.vala:632
+#: Core/SnapshotRepo.vala:635 Utility/Device.vala:1742 Utility/Device.vala:1752
 #: Gtk/RestoreDeviceBox.vala:98
 #, c-format
 msgid "Device"
@@ -638,7 +638,7 @@ msgstr ""
 msgid "Device name is empty!"
 msgstr ""
 
-#: Core/Main.vala:2956 Core/SnapshotRepo.vala:508
+#: Core/Main.vala:2963 Core/SnapshotRepo.vala:510
 msgid "Device not found"
 msgstr ""
 
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Dir not found"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:929
+#: Core/SnapshotRepo.vala:931
 msgid "Directory not found"
 msgstr ""
 
@@ -825,7 +825,7 @@ msgstr ""
 msgid "Failed to create subvolume snapshot"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:970
+#: Core/SnapshotRepo.vala:972
 msgid "Failed to create symlinks"
 msgstr ""
 
@@ -837,7 +837,7 @@ msgstr ""
 msgid "Failed to delete snapshot subvolume"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:996
+#: Core/SnapshotRepo.vala:998
 msgid "Failed to delete symlinks"
 msgstr ""
 
@@ -845,7 +845,7 @@ msgstr ""
 msgid "Failed to destroy qgroup"
 msgstr ""
 
-#: Core/Main.vala:3446 Core/Main.vala:3452
+#: Core/Main.vala:3460 Core/Main.vala:3466
 msgid "Failed to estimate system size"
 msgstr ""
 
@@ -863,7 +863,7 @@ msgstr ""
 msgid "Failed to get partition list"
 msgstr ""
 
-#: Core/Main.vala:3039
+#: Core/Main.vala:3046
 msgid "Failed to get partition list."
 msgstr ""
 
@@ -879,7 +879,7 @@ msgstr ""
 msgid "Failed to move file"
 msgstr ""
 
-#: Core/Main.vala:2716
+#: Core/Main.vala:2720
 msgid "Failed to move system subvolume to snapshot directory"
 msgstr ""
 
@@ -891,7 +891,7 @@ msgstr ""
 msgid "Failed to read file"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:916
+#: Core/SnapshotRepo.vala:918
 msgid "Failed to remove"
 msgstr ""
 
@@ -916,7 +916,7 @@ msgstr ""
 msgid "Failed to unmount"
 msgstr ""
 
-#: Core/Main.vala:3239
+#: Core/Main.vala:3246
 msgid "Failed to unmount device!"
 msgstr ""
 
@@ -987,7 +987,7 @@ msgstr ""
 msgid "Firefox, Chromium, Chrome, Opera, Epiphany, Midori"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:614
+#: Core/SnapshotRepo.vala:616
 msgid "First snapshot requires:"
 msgstr ""
 
@@ -1253,7 +1253,7 @@ msgstr ""
 msgid "Marked for deletion"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:658 Core/SnapshotRepo.vala:695
+#: Core/SnapshotRepo.vala:660 Core/SnapshotRepo.vala:697
 msgid "Maximum backups exceeded for backup level"
 msgstr ""
 
@@ -1269,7 +1269,7 @@ msgstr ""
 msgid "Missing Icon"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:636
+#: Core/SnapshotRepo.vala:638
 #, c-format
 msgid "Mode"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgstr ""
 msgid "Mount"
 msgstr ""
 
-#: Core/Main.vala:2720
+#: Core/Main.vala:2727
 msgid "Moved system subvolume to snapshot directory"
 msgstr ""
 
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "No snapshots available"
 msgstr ""
 
-#: Console/AppConsole.vala:312 Core/SnapshotRepo.vala:845
+#: Console/AppConsole.vala:312 Core/SnapshotRepo.vala:847
 #: Gtk/MainWindow.vala:1050
 msgid "No snapshots found"
 msgstr ""
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "No snapshots on device"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:612
+#: Core/SnapshotRepo.vala:614
 msgid "No snapshots on this device"
 msgstr ""
 
@@ -1349,7 +1349,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:630
+#: Core/SnapshotRepo.vala:632
 msgid "Not Selected"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Not Supported"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:576 Core/SnapshotRepo.vala:603
+#: Core/SnapshotRepo.vala:578 Core/SnapshotRepo.vala:605
 msgid "Not enough disk space"
 msgstr ""
 
@@ -1392,7 +1392,7 @@ msgid ""
 "supported."
 msgstr ""
 
-#: Core/Main.vala:3555
+#: Core/Main.vala:3569
 msgid "Older log files removed"
 msgstr ""
 
@@ -1400,7 +1400,7 @@ msgstr ""
 msgid "Oldest snapshot"
 msgstr ""
 
-#: Core/Main.vala:342 Core/Main.vala:3154 Gtk/RestoreDeviceBox.vala:525
+#: Core/Main.vala:342 Core/Main.vala:3161 Gtk/RestoreDeviceBox.vala:525
 msgid ""
 "Only ubuntu-type layouts with @ and @home subvolumes are currently supported."
 msgstr ""
@@ -1409,7 +1409,7 @@ msgstr ""
 msgid "Open Menu"
 msgstr ""
 
-#: Core/Main.vala:2938
+#: Core/Main.vala:2945
 msgid ""
 "Option --snapshot-device should not be specified for creating snapshots in "
 "BTRFS mode"
@@ -1441,7 +1441,7 @@ msgstr ""
 msgid "Partition has an unsupported subvolume layout."
 msgstr ""
 
-#: Core/SnapshotRepo.vala:635 Gtk/RestoreDeviceBox.vala:94
+#: Core/SnapshotRepo.vala:637 Gtk/RestoreDeviceBox.vala:94
 #, c-format
 msgid "Path"
 msgstr ""
@@ -1562,7 +1562,7 @@ msgid "Remove"
 msgstr ""
 
 #: Core/Main.vala:1406 Core/Main.vala:1417 Core/Snapshot.vala:424
-#: Core/SnapshotRepo.vala:922
+#: Core/SnapshotRepo.vala:924
 #, c-format
 msgid "Removed"
 msgstr ""
@@ -1571,7 +1571,7 @@ msgstr ""
 msgid "Removed cron task"
 msgstr ""
 
-#: Core/Main.vala:3296
+#: Core/Main.vala:3309
 #, c-format
 msgid "Removed mount directory: '%s'"
 msgstr ""
@@ -1580,8 +1580,8 @@ msgstr ""
 msgid "Removing"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:778 Core/SnapshotRepo.vala:797
-#: Core/SnapshotRepo.vala:815 Core/SnapshotRepo.vala:829
+#: Core/SnapshotRepo.vala:780 Core/SnapshotRepo.vala:799
+#: Core/SnapshotRepo.vala:817 Core/SnapshotRepo.vala:831
 #, c-format
 msgid "Removing snapshots"
 msgstr ""
@@ -1696,7 +1696,7 @@ msgstr ""
 msgid "Select '%s' device (default = %s)"
 msgstr ""
 
-#: Console/AppConsole.vala:661 Core/SnapshotRepo.vala:540
+#: Console/AppConsole.vala:661 Core/SnapshotRepo.vala:542
 msgid "Select BTRFS system disk with root subvolume (@)"
 msgstr ""
 
@@ -1745,7 +1745,7 @@ msgstr ""
 msgid "Select another device for root file system (/)"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:579 Core/SnapshotRepo.vala:606
+#: Core/SnapshotRepo.vala:581 Core/SnapshotRepo.vala:608
 msgid "Select another device or free up some space"
 msgstr ""
 
@@ -1797,7 +1797,7 @@ msgstr ""
 msgid "Select the items to be removed from the list"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:501
+#: Core/SnapshotRepo.vala:503
 msgid "Select the snapshot device"
 msgstr ""
 
@@ -1817,11 +1817,11 @@ msgstr ""
 msgid "Select the target devices where system will be cloned."
 msgstr ""
 
-#: Core/Main.vala:2966
+#: Core/Main.vala:2973
 msgid "Selected default snapshot device"
 msgstr ""
 
-#: Core/Main.vala:2843 Core/Main.vala:2847
+#: Core/Main.vala:2850 Core/Main.vala:2854
 msgid "Selected default snapshot type"
 msgstr ""
 
@@ -1837,7 +1837,7 @@ msgstr ""
 msgid "Selected snapshot device"
 msgstr ""
 
-#: Console/AppConsole.vala:660 Core/SnapshotRepo.vala:539
+#: Console/AppConsole.vala:660 Core/SnapshotRepo.vala:541
 msgid "Selected snapshot device is not a system disk"
 msgstr ""
 
@@ -1926,7 +1926,7 @@ msgstr ""
 msgid "Snaps"
 msgstr ""
 
-#: Core/Main.vala:1805 Core/SnapshotRepo.vala:661 Core/SnapshotRepo.vala:699
+#: Core/Main.vala:1805 Core/SnapshotRepo.vala:663 Core/SnapshotRepo.vala:701
 #: Gtk/SnapshotListBox.vala:93
 #, c-format
 msgid "Snapshot"
@@ -1947,20 +1947,20 @@ msgstr ""
 msgid "Snapshot deletion in progress..."
 msgstr ""
 
-#: Core/SnapshotRepo.vala:419
+#: Core/SnapshotRepo.vala:421
 #, c-format
 msgid "Snapshot device"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:507
+#: Core/SnapshotRepo.vala:509
 msgid "Snapshot device not available"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:500
+#: Core/SnapshotRepo.vala:502
 msgid "Snapshot device not selected"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:423
+#: Core/SnapshotRepo.vala:425
 #, c-format
 msgid "Snapshot location"
 msgstr ""
@@ -2073,7 +2073,7 @@ msgstr ""
 msgid "Specify target device"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:429
+#: Core/SnapshotRepo.vala:431
 #, c-format
 msgid "Status"
 msgstr ""
@@ -2095,7 +2095,7 @@ msgstr ""
 msgid "Switch to RSYNC mode (default: config)"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:976
+#: Core/SnapshotRepo.vala:978
 msgid "Symlinks updated"
 msgstr ""
 
@@ -2174,7 +2174,7 @@ msgstr ""
 msgid "The system partition has an unsupported subvolume layout."
 msgstr ""
 
-#: Core/Main.vala:3153
+#: Core/Main.vala:3160
 msgid "The target partition has an unsupported subvolume layout."
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "Unmounting from"
 msgstr ""
 
-#: Core/Main.vala:3157 Gtk/RestoreDeviceBox.vala:522
+#: Core/Main.vala:3164 Gtk/RestoreDeviceBox.vala:522
 msgid "Unsupported Subvolume Layout"
 msgstr ""
 
@@ -2399,7 +2399,7 @@ msgstr ""
 msgid "[Warning] Deleted invalid lock"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:829
+#: Core/SnapshotRepo.vala:831
 msgid "all"
 msgstr ""
 
@@ -2419,11 +2419,11 @@ msgstr ""
 msgid "crontab file installed"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:815
+#: Core/SnapshotRepo.vala:817
 msgid "incomplete"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:797
+#: Core/SnapshotRepo.vala:799
 msgid "marked for deletion"
 msgstr ""
 
@@ -2439,7 +2439,7 @@ msgstr ""
 msgid "rsync returned an error"
 msgstr ""
 
-#: Core/SnapshotRepo.vala:661 Core/SnapshotRepo.vala:699
-#: Core/SnapshotRepo.vala:778
+#: Core/SnapshotRepo.vala:663 Core/SnapshotRepo.vala:701
+#: Core/SnapshotRepo.vala:780
 msgid "un-tagged"
 msgstr ""