- allow to set cleanup algorithm

diff --git a/client/installation-helper.cc b/client/installation-helper.cc
index aa49ebc03ee6e613047aeb684002925cd25c4e4a..8976433236e9e5f9d2b41de60095edf42f3c444c 100644 (file)
--- a/client/installation-helper.cc
+++ b/client/installation-helper.cc
@@ -47,7 +47,8 @@ using namespace std;
 
 
 void
-step1(const string& device, const string& description, const map<string, string>& userdata)
+step1(const string& device, const string& description, const string& cleanup,
+      const map<string, string>& userdata)
 {
     // step runs in inst-sys
 
@@ -96,6 +97,7 @@ step1(const string& device, const string& description, const map<string, string>
     SCD scd;
     scd.read_only = false;
     scd.description = description;
+    scd.cleanup = cleanup;
     scd.userdata = userdata;
 
     Snapshots::iterator snapshot = snapper.createSingleSnapshot(scd);
@@ -196,23 +198,24 @@ step4()
 }
 
 bool
-step5(const string& root_prefix, const string& description, const string& snapshot_type,
-    unsigned int pre_num, const map<string, string>& userdata)
+step5(const string& root_prefix, const string& snapshot_type, unsigned int pre_num,
+      const string& description, const string& cleanup, const map<string, string>& userdata)
 {
     // fate #317973
 
     // preconditions (maybe incomplete):
     // snapper rpms installed
 
-    Snapshots::iterator snapshot;
     SCD scd;
-
     scd.read_only = true;
     scd.description = description;
+    scd.cleanup = cleanup;
     scd.userdata = userdata;
 
     Snapper snapper("root", root_prefix);
 
+    Snapshots::iterator snapshot;
+
     try
     {
         if (snapshot_type == "single") {
@@ -264,10 +267,11 @@ main(int argc, char** argv)
        { "device",                     required_argument,      0,      0 },
        { "root-prefix",                required_argument,      0,      0 },
        { "default-subvolume-name",     required_argument,      0,      0 },
-       { "description",                required_argument,      0,      0 },
        { "snapshot-type",              required_argument,      0,      0 },
        { "pre-num",                    required_argument,      0,      0 },
-       { "userdata",                   required_argument,      0,      'u' },
+       { "description",                required_argument,      0,      0 },
+       { "cleanup",                    required_argument,      0,      0 },
+       { "userdata",                   required_argument,      0,      0 },
        { 0, 0, 0, 0 }
     };
 
@@ -275,9 +279,10 @@ main(int argc, char** argv)
     string device;
     string root_prefix = "/";
     string default_subvolume_name;
-    string description;
     string snapshot_type = "single";
     unsigned int pre_num = 0;
+    string description;
+    string cleanup;
     map<string, string> userdata;
 
     GetOpts getopts;
@@ -300,20 +305,23 @@ main(int argc, char** argv)
     if ((opt = opts.find("default-subvolume-name")) != opts.end())
        default_subvolume_name = opt->second;
 
-    if ((opt = opts.find("description")) != opts.end())
-       description = opt->second;
-
     if ((opt = opts.find("snapshot-type")) != opts.end())
        snapshot_type = opt->second;
 
     if ((opt = opts.find("pre-num")) != opts.end())
        pre_num = read_num(opt->second);
 
+    if ((opt = opts.find("description")) != opts.end())
+       description = opt->second;
+
+    if ((opt = opts.find("cleanup")) != opts.end())
+       cleanup = opt->second;
+
     if ((opt = opts.find("userdata")) != opts.end())
        userdata = read_userdata(opt->second);
 
     if (step == "1")
-       step1(device, description, userdata);
+       step1(device, description, cleanup, userdata);
     else if (step == "2")
        step2(device, root_prefix, default_subvolume_name);
     else if (step == "3")
@@ -321,5 +329,5 @@ main(int argc, char** argv)
     else if (step == "4")
        step4();
     else if (step == "5")
-       return step5(root_prefix, description, snapshot_type, pre_num, userdata) ? EXIT_SUCCESS : EXIT_FAILURE;
+       return step5(root_prefix, snapshot_type, pre_num, description, cleanup, userdata) ? EXIT_SUCCESS : EXIT_FAILURE;
 }

diff --git a/package/snapper.changes b/package/snapper.changes
index 6db6db7a52bdb49c56e6fc1e47e92d6e5d0fc2ba..4fb6ff50e0a71f861761e4072a2b15180be2d846 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 29 14:52:31 CEST 2015 - aschnell@suse.de
+
+- allow to set cleanup algorithm for snapshots created by helper
+  programs
+
 -------------------------------------------------------------------
 Tue Jun 02 14:55:07 CEST 2015 - aschnell@suse.de