On Sat, Dec 08, 2018 at 12:15:53AM +0100, Marco d'Itri wrote:
> preinst says:
>
> # Disable diversions of pm-utils binaries until #812545 is fixed
> #for cmd in pm-hibernate pm-suspend pm-suspend-hybrid ; do
> # dpkg-divert --package molly-guard --divert /lib/molly-guard/$cmd
> --rename /usr/sbin/$cmd
> #done
>
> But #812545 was fixed in May, so molly-guard should be fixed, again.
I can confirm that a fixed molly-guard can happily be co-installed with
usrmerge (once the Conflict is removed).
Needed patch:
diff --git a/debian/molly-guard.postrm b/debian/molly-guard.postrm
index cdec65a..3f3e3e2 100755
--- a/debian/molly-guard.postrm
+++ b/debian/molly-guard.postrm
@@ -23,10 +23,9 @@ case "$1" in
dpkg-divert --package molly-guard --rename --remove /sbin/$cmd
done
- # Disable diversions of pm-utils binaries until #812545 is fixed
- #for cmd in pm-hibernate pm-suspend pm-suspend-hybrid ; do
- # dpkg-divert --package molly-guard --rename --remove /usr/sbin/$cmd
- #done
+ for cmd in pm-hibernate pm-suspend pm-suspend-hybrid ; do
+ dpkg-divert --package molly-guard --rename --remove /usr/sbin/$cmd
+ done
(test -d /lib/molly-guard && rmdir --ignore-fail-on-non-empty
/lib/molly-guard) || true
;;
diff --git a/debian/molly-guard.preinst b/debian/molly-guard.preinst
index e999c74..6137bac 100755
--- a/debian/molly-guard.preinst
+++ b/debian/molly-guard.preinst
@@ -25,10 +25,9 @@ case "$1" in
dpkg-divert --package molly-guard --divert /lib/molly-guard/$cmd
--rename /sbin/$cmd
done
- # Disable diversions of pm-utils binaries until #812545 is fixed
- #for cmd in pm-hibernate pm-suspend pm-suspend-hybrid ; do
- # dpkg-divert --package molly-guard --divert /lib/molly-guard/$cmd
--rename /usr/sbin
- #done
+ for cmd in pm-hibernate pm-suspend pm-suspend-hybrid ; do
+ dpkg-divert --package molly-guard --divert /lib/molly-guard/$cmd
--rename /usr/sbin/
+ done
;;
abort-upgrade)
I will do an NMU to experimental no earlier than June 13 unless the
molly-guard maintainers speak up.
Greetings
Marc
