From 2fff8c6259748a9d9b2bea46bcf47412117de71f Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Thu, 17 Apr 2014 15:01:17 +0200 Subject: [PATCH] - fixed parent of snapshot generated by rollback --- client/snapper.cc | 17 ++++++++++------- doc/snapper.xml.in | 4 ++-- package/snapper.changes | 5 +++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/client/snapper.cc b/client/snapper.cc index 82beab91..9d97af74 100644 --- a/client/snapper.cc +++ b/client/snapper.cc @@ -1263,22 +1263,25 @@ command_rollback(DBus::Connection* conn, Snapper* snapper) exit(EXIT_FAILURE); } - unsigned int tmp; + unsigned int num2; if (getopts.numArgs() == 0) { - tmp = command_create_single_xsnapshot_of_default(*conn, config_name, true, description, - cleanup, userdata); + command_create_single_xsnapshot_of_default(*conn, config_name, true, description, cleanup, + userdata); + + num2 = command_create_single_xsnapshot_v2(*conn, config_name, 0, false, description, + cleanup, userdata); } else { - tmp = read_num(getopts.popArg()); + unsigned int tmp = read_num(getopts.popArg()); command_create_single_xsnapshot(*conn, config_name, description, cleanup, userdata); - } - unsigned int num2 = command_create_single_xsnapshot_v2(*conn, config_name, tmp, false, - description, cleanup, userdata); + num2 = command_create_single_xsnapshot_v2(*conn, config_name, tmp, false, + description, cleanup, userdata); + } filesystem->setDefault(num2); diff --git a/doc/snapper.xml.in b/doc/snapper.xml.in index 1f7bf739..48d3722e 100644 --- a/doc/snapper.xml.in +++ b/doc/snapper.xml.in @@ -491,8 +491,8 @@ Without a number, a first read-only snapshot of the - default subvolume is created. A second read-write snapshot is created of the - first snapshot. The system is set to boot from the second snapshot. + default subvolume is created. A second read-write snapshot of the current + system is created. The system is set to boot from the second snapshot. With a number, a first read-only snapshot of the current diff --git a/package/snapper.changes b/package/snapper.changes index 97927308..19d05b82 100644 --- a/package/snapper.changes +++ b/package/snapper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 17 15:00:25 CEST 2014 - aschnell@suse.de + +- fixed parent of snapshot generated by rollback + ------------------------------------------------------------------- Thu Apr 10 10:17:49 CEST 2014 - aschnell@suse.de -- 2.47.3