Bug#802545: systemd: postinst may not have run correctly on upgrades from jessie

[Michael Biebl]

Hi Andreas

On Wed, 21 Oct 2015 00:05:37 +0200 Andreas Beckmann <a...@debian.org> wrote:

> # error while comparing the chroots (after removing the package to be tested 
> + dependencies)
> 1m19.7s ERROR: FAIL: After purging files have disappeared:
>   /etc/dbus-1/system.d/org.freedesktop.machine1.conf.dpkg-remove       not 
> owned
>   /etc/systemd/system/halt.target.wants/       not owned
>   /etc/systemd/system/halt.target.wants/hwclock-save.service -> 
> /lib/systemd/system/hwclock-save.service       not owned
>   /etc/systemd/system/poweroff.target.wants/   not owned
>   /etc/systemd/system/poweroff.target.wants/hwclock-save.service -> 
> /lib/systemd/system/hwclock-save.service   not owned
>   /etc/systemd/system/reboot.target.wants/     not owned

Could you re-run the tests with an up-to-date testing?
I wonder whether we actually need the versioned Depends on dpkg or if
the upgrade from jesse -> stretch is actually fine now.

So all we would need to do is to cleanup the state for our
testing/unstable users.

The attached patch should be sufficient I guess.

Regards,
Michael

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?

diff --git a/debian/systemd.maintscript b/debian/systemd.maintscript
index 44697bd..ddb96ae 100644
--- a/debian/systemd.maintscript
+++ b/debian/systemd.maintscript
@@ -2,5 +2,5 @@ rm_conffile /etc/bash_completion.d/systemctl-bash-completion.sh 204-1~
 rm_conffile /etc/bash_completion.d/systemd-bash-completion.sh 204-1~
 mv_conffile /etc/systemd/systemd-logind.conf /etc/systemd/logind.conf 204-1~
 mv_conffile /etc/systemd/systemd-journald.conf /etc/systemd/journald.conf 204-1~
-rm_conffile /etc/dbus-1/system.d/org.freedesktop.machine1.conf 224-2~
+rm_conffile /etc/dbus-1/system.d/org.freedesktop.machine1.conf 228-5~
 rm_conffile /etc/X11/xinit/xinitrc.d/50-systemd-user.sh 228-3~
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index 8d1f106..ab48565 100644
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -141,7 +141,7 @@ if [ -n "$2" ]; then
 fi
 
 # Cleanup hwclock-save.service, which was shipped in jessie.
-if dpkg --compare-versions "$2" lt-nl "219-8"; then
+if dpkg --compare-versions "$2" lt-nl "228-5~"; then
    for t in reboot halt poweroff ; do
        rm -f /etc/systemd/system/${t}.target.wants/hwclock-save.service
        rmdir --ignore-fail-on-non-empty /etc/systemd/system/${t}.target.wants 2> /dev/null || true

signature.asc
Description: OpenPGP digital signature