linuxmint/timeshift
1
1
Fork 0
mirror of https://github.com/linuxmint/timeshift.git synced 2024-10-26 18:03:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Save subvolume info after creating pre-restore snapshot

Browse Source
This commit is contained in:
Tony George 2017-01-14 19:33:33 +05:30
parent 98d184eb57
commit 8aec9bb822
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/Main.vala
View File

@ -2692,6 +2692,8 @@ public class Main : GLib.Object{
// move subvolumes ----------------
bool no_subvolumes_found = true;
var subvol_list = new Gee.ArrayList<Subvolume>();
foreach(string subvol_name in new string[] { "@", "@home" }){
@ -2706,17 +2708,22 @@ public class Main : GLib.Object{
}
no_subvolumes_found = false;
string dst_path = path_combine(snapshot_path, subvol_name);
cmd = "mv '%s' '%s'".printf(src_path, dst_path);
log_debug(cmd);
int status = exec_sync(cmd, out std_out, out std_err);
if (status != 0){
log_error (std_err);
log_error(_("Failed to move system subvolume to snapshot directory") + ": %s".printf(subvol_name));
return false;
}
else{
var subvol_dev = (subvol_name == "@") ? repo.device : repo.device_home;
subvol_list.add(new Subvolume(subvol_name, dst_path, subvol_dev.uuid));
log_msg(_("Moved system subvolume to snapshot directory") + ": %s".printf(subvol_name));
}
}
@ -2739,7 +2746,7 @@ public class Main : GLib.Object{
snap.live = true;
// write subvolume info
foreach(var subvol in sys_subvolumes.values){
foreach(var subvol in subvol_list){
snap.subvolumes.set(subvol.name, subvol);
}

2
src/Core/Subvolume.vala
View File

@ -82,7 +82,7 @@ public class Subvolume : GLib.Object{
if (dir_exists(path)){
cmd = "btrfs subvolume delete '%s'".printf(path);
if (LOG_COMMANDS) { log_debug(cmd); }
log_debug(cmd);
ret_val = exec_sync(cmd, out std_out, out std_err);
if (ret_val != 0){
log_error(_("Failed to delete snapshot subvolume") + ": '%s'".printf(path));