- fixed parent of snapshot generated by rollback

diff --git a/client/snapper.cc b/client/snapper.cc
index 82beab91770ce7c7b441b3a900bb6081c1f97073..9d97af740451b6115d2364a842008be52a1e3137 100644 (file)
--- 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 1f7bf73907d48a8e4a45da5e723c1467edce8c2a..48d3722e7585f2a913f66122e1f691bd730189fd 100644 (file)
--- a/doc/snapper.xml.in
+++ b/doc/snapper.xml.in
@@ -491,8 +491,8 @@
          <itemizedlist>
            <listitem>
              <para>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.</para>
+             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.</para>
            </listitem>
            <listitem>
              <para>With a number, a first read-only snapshot of the current

diff --git a/package/snapper.changes b/package/snapper.changes
index 979273081d362ba108dba6da00d5f306fa6241af..19d05b82ce676374b7d543018ac5172d86480849 100644 (file)
--- 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