Bug#797048: systemd: obsolete conffile /etc/dbus-1/system.d/org.freedesktop.machine1.conf

[Felipe Sateler]

On 27 August 2015 at 07:48, Michael Biebl <biebl at debian.org> wrote:
> Hi Jakub,
>
> Am 27.08.2015 um 12:09 schrieb Jakub Wilk:
>> Package: systemd
>> Version: 224-2
>> User: debian-qa at lists.debian.org
>> Usertags: adequate obsolete-conffile
>>
>> The package left obsolete conffile after upgrade:
>> /etc/dbus-1/system.d/org.freedesktop.machine1.conf
>
> This is due to the package split in 224-2 and we were well aware of that
> before the upload. TTBOMK, there is no mechanism in Debian how you can
> transfer conffiles safely from on package to another.
> I'd be delighted to learn otherwise.
>

I think that rm_conffile in systemd + versioned depends in
systemd-container will do it.

A snippet should be added to systemd-container postinst that copies
back the .dpkg-bak file if it exists to preserve user modifications.

So, it should be:

debian/systemd.maintscript:
rm_conffile /etc/dbus-1/system.d/org.freedesktop.machine1.conf 224-2~

debian/systemd-container.postinst:

if [ "$1" = configure ] && [ -z "$2" ] && \
   [ -f /etc/dbus-1/system.d/org.freedesktop.machine1.conf.dpkg-bak ] ; then
    # copy stale file from systemd package on new installs
     mv  /etc/dbus-1/system.d/org.freedesktop.machine1.conf.dpkg-bak \
         /etc/dbus-1/system.d/org.freedesktop.machine1.conf
fi

systemd-container already conflicts older systemd versions, and
depends on systemd, so this should work.

I haven't tested this though, and the postinst condition could be
expanded to include the nonconforming upload done but I'm not sure it
is worth the trouble.

-- 

Saludos,
Felipe Sateler