From 3e83cdc2f7cfe5103d493f15c4e38a0fcff126ff Mon Sep 17 00:00:00 2001
From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 24 Jan 2014 10:34:27 +0100
Subject: [PATCH] - removed grub-snapper-plugin subpackage (fate#316232)

---
 package/snapper.changes |  5 +++++
 scripts/Makefile.am     |  3 +--
 snapper.spec.in         | 25 -------------------------
 snapper/Snapper.cc      | 16 ++++++++++++++++
 snapper/Snapshot.cc     | 25 ++++++++++++++++++-------
 5 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/package/snapper.changes b/package/snapper.changes
index e0fb26ca..21233141 100644
--- 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 85e1e5ad..efb53729 100644
--- 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 fdeb1b69..87e0a273 100644
--- 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 4aef880c..400ced6f 100644
--- 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 5eecc15b..a5e98f54 100644
--- 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
     }