- removed grub-snapper-plugin subpackage (fate#316232)

diff --git a/package/snapper.changes b/package/snapper.changes
index e0fb26ca1b881c2345bf29d04b90e274fe99cd08..212331415865e05cf9d786c55c1a9f8fdfb9d2cf 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 24 10:01:35 CET 2014 - aschnell@suse.de
+
+- removed grub-snapper-plugin subpackage (fate#316232)
+
 -------------------------------------------------------------------
 Fri Dec 13 16:10:42 CET 2013 - aschnell@suse.de
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 85e1e5ad6598d893ebc4f24849fb40d88011372b..efb53729bea801b3d071df7279ebc0fb009cc03c 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -14,13 +14,12 @@ pam_snapper_SCRIPTS =                       \
 
 endif
 
-EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py grub-plugin.py $(pam_snapper_SCRIPTS)
+EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py $(pam_snapper_SCRIPTS)
 
 install-data-local:
        install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper
        install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper
 if HAVE_ZYPP
        install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py
-       install -D grub-plugin.py $(DESTDIR)/usr/lib/snapper/plugins/grub.py
 endif
 

diff --git a/snapper.spec.in b/snapper.spec.in
index fdeb1b691ba12a482a2b14f03391b4eb67698198..87e0a2731a6ab1f9c25363747e040da5a3d36316 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -203,31 +203,6 @@ Authors:
 %doc %{_mandir}/*/snapper-zypp-plugin.8*
 %doc %{_mandir}/*/snapper-zypp-plugin.conf.5*
 
-%package -n grub-snapper-plugin
-BuildArch:     noarch
-Requires:       python
-Requires:       python-xattr
-Requires:       snapper = %version
-%if 0%{?suse_version}
-Supplements:    packageand(snapper-zypp-plugin:grub2)
-%endif
-Summary:        A snapper plugin for adding snapshot metadata for grub2
-Group:          System/Packages
-
-%description -n grub-snapper-plugin
-This package contains a plugin for snapper that adds metadata to snapshots
-used by grub2.
-
-Authors:
---------
-    Arvin Schnell <aschnell@suse.de>
-
-%files -n grub-snapper-plugin
-%defattr(-,root,root)
-%dir /usr/lib/snapper
-%dir /usr/lib/snapper/plugins
-/usr/lib/snapper/plugins/grub.py*
-
 %package -n pam_snapper
 Requires:       pam
 Requires:       snapper = %version

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 4aef880cd69b02cc12aecc98fcfdfd08c13d2b8f..400ced6fbf1a5baf26d44b667acf84d7b25e108d 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -368,6 +368,14 @@ namespace snapper
        }
 
        filesystem->createConfig();
+
+#if 1
+       if (subvolume == "/" && filesystem->fstype() == "btrfs" &&
+           access("/usr/lib/snapper/plugins/grub", X_OK) == 0)
+       {
+           SystemCmd cmd("/usr/lib/snapper/plugins/grub --enable");
+       }
+#endif
     }
 
 
@@ -379,6 +387,14 @@ namespace snapper
 
        auto_ptr<Snapper> snapper(new Snapper(config_name));
 
+#if 1
+       if (snapper->subvolumeDir() == "/" && snapper->getFilesystem()->fstype() == "btrfs" &&
+           access("/usr/lib/snapper/plugins/grub", X_OK) == 0)
+       {
+           SystemCmd cmd("/usr/lib/snapper/plugins/grub --disable");
+       }
+#endif
+
        Snapshots& snapshots = snapper->getSnapshots();
        for (Snapshots::iterator it = snapshots.begin(); it != snapshots.end(); )
        {

diff --git a/snapper/Snapshot.cc b/snapper/Snapshot.cc
index 5eecc15bc4ae83936b2e4ca5cae0a1d374ade9b9..a5e98f54e4f9602aebe907b4808377f7bbbc017a 100644 (file)
--- a/snapper/Snapshot.cc
+++ b/snapper/Snapshot.cc
@@ -669,14 +669,9 @@ namespace snapper
 
 #if 1
        if (snapper->subvolumeDir() == "/" && snapper->getFilesystem()->fstype() == "btrfs" &&
-           snapshot.getType() == PRE && access("/usr/lib/snapper/plugins/grub.py", X_OK) == 0)
+           access("/usr/lib/snapper/plugins/grub", X_OK) == 0)
        {
-           map<string, string> userdata = snapshot.getUserdata();
-           map<string, string>::const_iterator it = userdata.find("important");
-           bool important = it != userdata.end() && it->second == "yes";
-
-           SystemCmd cmd(sformat("/usr/lib/snapper/plugins/grub.py %d %s", snapshot.getNum(),
-                                 important ? "yes" : "no"));
+           SystemCmd cmd("/usr/lib/snapper/plugins/grub --refresh");
        }
 #endif
 
@@ -705,6 +700,14 @@ namespace snapper
        snapshot->userdata = userdata;
 
        snapshot->writeInfo();
+
+#if 1
+       if (snapper->subvolumeDir() == "/" && snapper->getFilesystem()->fstype() == "btrfs" &&
+           access("/usr/lib/snapper/plugins/grub", X_OK) == 0)
+       {
+           SystemCmd cmd("/usr/lib/snapper/plugins/grub --refresh");
+       }
+#endif
     }
 
 
@@ -739,6 +742,14 @@ namespace snapper
        infos_dir.unlink(decString(snapshot->getNum()), AT_REMOVEDIR);
 
        entries.erase(snapshot);
+
+#if 1
+       if (snapper->subvolumeDir() == "/" && snapper->getFilesystem()->fstype() == "btrfs" &&
+           access("/usr/lib/snapper/plugins/grub", X_OK) == 0)
+       {
+           SystemCmd cmd("/usr/lib/snapper/plugins/grub --refresh");
+       }
+#endif
     }