Skip to content
Snippets Groups Projects
Commit 9e2b2025 authored by Andrea Bolognani's avatar Andrea Bolognani
Browse files

snippets: Drop custom conffile transfer logic

This logic was introduced with the intent to smoothly transfer
conffiles between binary packages. It was initially used in just
a few scenarios, but with last year's big rework its use was
significantly expanded.

More recently, two important flaws have been identified with
this approach:

  * since our logic requires maintscripts to be called in a
    very specific order, we have added several Depends and
    Recommends relationships between packages specifically to
    enforce that. However, dpkg can sometimes reorder
    operations in ways that break our assumptions while still
    being entirely compliant with Policy;

  * conffiles that have been modified by the local admin are
    always preserved as is, even when the file shipped in the
    package has been modified between the two versions
    involved in the upgrade. The expectation is that the user
    will be prompted so that they can decide how to handle
    the situation instead.

Luckily, it turns out that dpkg already does a very good job
at coping with conffiles moving between packages, so we can
just rip out our custom logic completely and that will solve
both issues at once.

There are a couple of minor drawbacks:

  * depending on the order in which packages are unpacked,
    which we have no control over, the package which used to
    own the conffile might end up still having a record of
    that, though it will be marked as "obsolete". This is
    primarily a cosmetic issue, and it can for the most part
    be addressed by simply reinstalling the package. We are
    likely going to inform users about this in the trixie
    release notes;

  * conffiles that had been deleted might get recreated.
    This is a bit annoying and there is no convenient way
    to prevent it from happening, but there's no actual
    functional impact as libvirt behaves the same way
    whether the conffile doesn't exist or only contains
    comments, as is the default.

The benefits very clearly outweigh the drawbacks, so we're
making the switch.

Closes: #1094583
parent 0e6a7938
No related branches found
No related tags found
1 merge request!256Fix conffile transfer
Showing
with 0 additions and 688 deletions
......@@ -16,33 +16,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#ABORT_CONFFILE_TRANSFER#
CLIENTS_TO_COMMON="
/etc/libvirt/libvirt-admin.conf
/etc/libvirt/libvirt.conf
"
case "$1" in
abort-install|abort-upgrade)
abort_conffile_transfer \
"/etc/libvirt/virt-login-shell.conf" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-clients" \
"libvirt-login-shell" \
-- \
"$@"
for conf in $CLIENTS_TO_COMMON; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-clients" \
"libvirt-common" \
-- \
"$@"
done
;;
remove|purge|upgrade|disappear|failed-upgrade)
......
......@@ -12,33 +12,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#PREPARE_CONFFILE_TRANSFER#
CLIENTS_TO_COMMON="
/etc/libvirt/libvirt-admin.conf
/etc/libvirt/libvirt.conf
"
case "$1" in
install|upgrade)
prepare_conffile_transfer \
"/etc/libvirt/virt-login-shell.conf" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-clients" \
"libvirt-login-shell" \
-- \
"$@"
for conf in $CLIENTS_TO_COMMON; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-clients" \
"libvirt-common" \
-- \
"$@"
done
;;
abort-upgrade)
......
......@@ -14,25 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
CLIENTS_TO_COMMON="
/etc/libvirt/libvirt-admin.conf
/etc/libvirt/libvirt.conf
"
case "$1" in
configure)
for conf in $CLIENTS_TO_COMMON; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-clients" \
"libvirt-common" \
-- \
"$@"
done
;;
abort-upgrade|abort-remove|abort-deconfigure)
......
......@@ -14,7 +14,6 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
#DELETE_PROTECTIVE_DIVERSION#
add_users_groups()
......@@ -40,15 +39,6 @@ add_statoverrides()
done
}
DAEMON_SYSTEM_TO_DAEMON_COMMON="
/etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
/etc/default/libvirt-guests
/etc/sasl2/libvirt.conf
"
DAEMON_SYSTEM_SYSV_TO_DAEMON_COMMON="
/etc/init.d/libvirt-guests
"
DAEMON_COMMON_UNITS="
libvirt-guests.service
virt-guest-shutdown.target
......@@ -65,27 +55,6 @@ case "$1" in
rmdir --ignore-fail-on-non-empty /var/log/libvirt/uml
fi
for conf in $DAEMON_SYSTEM_TO_DAEMON_COMMON; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-common" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON_COMMON; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon-common" \
-- \
"$@"
done
for unit in $DAEMON_COMMON_UNITS; do
delete_protective_diversion \
"/lib/systemd/system/$unit" \
......
......@@ -15,7 +15,6 @@ set -e
# the debian-policy package
#CREATE_CONFIG_FROM_TEMPLATE#
#FINISH_CONFFILE_TRANSFER#
case "$1" in
configure)
......@@ -25,14 +24,6 @@ case "$1" in
"6.9.0-2~" \
-- \
"$@"
finish_conffile_transfer \
"/etc/libvirt/qemu/networks/default.xml" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-config-network" \
-- \
"$@"
# Trigger daemon restart after installing configuration files
dpkg-trigger libvirt-restart-libvirtd
......
......@@ -15,7 +15,6 @@ set -e
# the debian-policy package
#CREATE_CONFIG_FROM_TEMPLATE#
#FINISH_CONFFILE_TRANSFER#
NWFILTERS="
allow-arp
......@@ -64,16 +63,6 @@ case "$1" in
-- \
"$@"
done
for nwfilter in $NWFILTERS; do
finish_conffile_transfer \
"/etc/libvirt/nwfilter/$nwfilter.xml" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-config-nwfilter" \
-- \
"$@"
done
# Trigger daemon restart after installing configuration files
dpkg-trigger libvirt-restart-libvirtd
......
......@@ -14,27 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
DAEMON_SYSTEM_TO_DAEMON_DRIVER_LXC="
/etc/apparmor.d/abstractions/libvirt-lxc
/etc/apparmor.d/libvirt/TEMPLATE.lxc
/etc/libvirt/lxc.conf
/etc/logrotate.d/libvirtd.lxc
"
case "$1" in
configure)
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_LXC; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-lxc" \
-- \
"$@"
done
# Obsolete AppArmor stuff included until 9.6.0-1
ABSTRACTIONS_DIR="/etc/apparmor.d/abstractions"
......
......@@ -14,25 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
DAEMON_SYSTEM_TO_DAEMON_DRIVER_NETWORK="
/etc/libvirt/network.conf
"
case "$1" in
configure)
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_NETWORK; do
finish_conffile_transfer \
"$conf" \
"10.4.0-1~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-network" \
-- \
"$@"
done
# Trigger daemon restart after installing a driver
dpkg-trigger libvirt-restart-libvirtd
;;
......
......@@ -16,8 +16,6 @@ set -e
. /usr/share/debconf/confmodule
#FINISH_CONFFILE_TRANSFER#
# Allocated UID and GID for libvirt-qemu
LIBVIRT_QEMU_UID=64055
LIBVIRT_QEMU_GID=64055
......@@ -93,15 +91,6 @@ add_statoverrides()
fi
}
DAEMON_SYSTEM_TO_DAEMON_DRIVER_QEMU="
/etc/apparmor.d/abstractions/libvirt-qemu
/etc/apparmor.d/libvirt/TEMPLATE.qemu
/etc/libvirt/qemu-lockd.conf
/etc/libvirt/qemu-sanlock.conf
/etc/libvirt/qemu.conf
/etc/logrotate.d/libvirtd.qemu
"
case "$1" in
configure)
add_users_groups
......@@ -122,17 +111,6 @@ case "$1" in
# Force refresh of capabilities (#731815)
rm -f /var/cache/libvirt/qemu/capabilities/*.xml
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_QEMU; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-qemu" \
-- \
"$@"
done
# Obsolete AppArmor stuff included until 9.6.0-1
ABSTRACTIONS_DIR="/etc/apparmor.d/abstractions"
LOCAL_ABSTRACTIONS_DIR="/etc/apparmor.d/local/abstractions"
......
......@@ -14,28 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
DAEMON_SYSTEM_TO_DAEMON_DRIVER_XEN="
/etc/libvirt/libxl-lockd.conf
/etc/libvirt/libxl-sanlock.conf
/etc/libvirt/libxl.conf
/etc/logrotate.d/libvirtd.libxl
"
case "$1" in
configure)
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_XEN; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-xen" \
-- \
"$@"
done
# Trigger daemon restart after installing a driver
dpkg-trigger libvirt-restart-libvirtd
;;
......
......@@ -14,14 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
#DELETE_PROTECTIVE_DIVERSION#
DAEMON_SYSTEM_TO_DAEMON_LOCK="
/etc/default/virtlockd
/etc/libvirt/virtlockd.conf
"
DAEMON_LOCK_UNITS="
virtlockd-admin.socket
virtlockd.service
......@@ -30,17 +24,6 @@ DAEMON_LOCK_UNITS="
case "$1" in
configure)
for conf in $DAEMON_SYSTEM_TO_DAEMON_LOCK; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-lock" \
-- \
"$@"
done
for unit in $DAEMON_LOCK_UNITS; do
delete_protective_diversion \
"/lib/systemd/system/$unit" \
......
......@@ -14,17 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
#DELETE_PROTECTIVE_DIVERSION#
DAEMON_SYSTEM_TO_DAEMON_LOG="
/etc/default/virtlogd
/etc/libvirt/virtlogd.conf
"
DAEMON_SYSTEM_SYSV_TO_DAEMON_LOG="
/etc/init.d/virtlogd
"
DAEMON_LOG_UNITS="
virtlogd-admin.socket
virtlogd.service
......@@ -33,27 +24,6 @@ DAEMON_LOG_UNITS="
case "$1" in
configure)
for conf in $DAEMON_SYSTEM_TO_DAEMON_LOG; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-log" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON_LOG; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon-log" \
-- \
"$@"
done
for unit in $DAEMON_LOG_UNITS; do
delete_protective_diversion \
"/lib/systemd/system/$unit" \
......
......@@ -14,8 +14,6 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
add_statoverrides()
{
SANLOCK_DIR="/var/lib/libvirt/sanlock"
......@@ -26,24 +24,9 @@ add_statoverrides()
fi
}
SANLOCK_TO_DAEMON_PLUGIN_SANLOCK="
/etc/cron.weekly/libvirt-sanlock
"
case "$1" in
configure)
add_statoverrides
for conf in $SANLOCK_TO_DAEMON_PLUGIN_SANLOCK; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-sanlock" \
"libvirt-daemon-plugin-sanlock" \
-- \
"$@"
done
;;
abort-upgrade|abort-remove|abort-deconfigure)
......
......@@ -16,50 +16,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#ABORT_CONFFILE_TRANSFER#
DAEMON_SYSTEM_SYSV_TO_DAEMON_COMMON="
/etc/init.d/libvirt-guests
"
DAEMON_SYSTEM_SYSV_TO_DAEMON="
/etc/init.d/libvirtd
"
DAEMON_SYSTEM_SYSV_TO_DAEMON_LOG="
/etc/init.d/virtlogd
"
case "$1" in
abort-install|abort-upgrade)
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON_COMMON; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon-common" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON_LOG; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon-log" \
-- \
"$@"
done
;;
remove|purge|upgrade|disappear|failed-upgrade)
......
......@@ -12,50 +12,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#PREPARE_CONFFILE_TRANSFER#
DAEMON_SYSTEM_SYSV_TO_DAEMON_COMMON="
/etc/init.d/libvirt-guests
"
DAEMON_SYSTEM_SYSV_TO_DAEMON="
/etc/init.d/libvirtd
"
DAEMON_SYSTEM_SYSV_TO_DAEMON_LOG="
/etc/init.d/virtlogd
"
case "$1" in
install|upgrade)
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON_COMMON; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon-common" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON_LOG; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon-log" \
-- \
"$@"
done
;;
abort-upgrade)
......
......@@ -16,8 +16,6 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#ABORT_CONFFILE_TRANSFER#
NWFILTERS="
allow-arp
allow-dhcp
......@@ -39,149 +37,8 @@ NWFILTERS="
qemu-announce-self-rarp
"
DAEMON_SYSTEM_TO_DAEMON_COMMON="
/etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
/etc/default/libvirt-guests
/etc/sasl2/libvirt.conf
"
DAEMON_SYSTEM_TO_DAEMON="
/etc/apparmor.d/usr.sbin.libvirtd
/etc/default/libvirtd
/etc/libvirt/libvirtd.conf
/etc/logrotate.d/libvirtd
"
DAEMON_SYSTEM_TO_DAEMON_LOG="
/etc/default/virtlogd
/etc/libvirt/virtlogd.conf
"
DAEMON_SYSTEM_TO_DAEMON_LOCK="
/etc/default/virtlockd
/etc/libvirt/virtlockd.conf
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_XEN="
/etc/libvirt/libxl-lockd.conf
/etc/libvirt/libxl-sanlock.conf
/etc/libvirt/libxl.conf
/etc/logrotate.d/libvirtd.libxl
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_LXC="
/etc/apparmor.d/abstractions/libvirt-lxc
/etc/apparmor.d/libvirt/TEMPLATE.lxc
/etc/libvirt/lxc.conf
/etc/logrotate.d/libvirtd.lxc
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_QEMU="
/etc/apparmor.d/abstractions/libvirt-qemu
/etc/apparmor.d/libvirt/TEMPLATE.qemu
/etc/libvirt/qemu-lockd.conf
/etc/libvirt/qemu-sanlock.conf
/etc/libvirt/qemu.conf
/etc/logrotate.d/libvirtd.qemu
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_NETWORK="
/etc/libvirt/network.conf
"
case "$1" in
abort-install|abort-upgrade)
abort_conffile_transfer \
"/etc/libvirt/qemu/networks/default.xml" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-config-network" \
-- \
"$@"
for nwfilter in $NWFILTERS; do
abort_conffile_transfer \
"/etc/libvirt/nwfilter/$nwfilter.xml" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-config-nwfilter" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_COMMON; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-common" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_LOG; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-log" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_LOCK; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-lock" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_XEN; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-xen" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_LXC; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-lxc" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_QEMU; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-qemu" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_NETWORK; do
abort_conffile_transfer \
"$conf" \
"10.4.0-1~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-network" \
-- \
"$@"
done
;;
remove|purge|upgrade|disappear|failed-upgrade)
......
......@@ -12,8 +12,6 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#PREPARE_CONFFILE_TRANSFER#
NWFILTERS="
allow-arp
allow-dhcp
......@@ -35,149 +33,8 @@ NWFILTERS="
qemu-announce-self-rarp
"
DAEMON_SYSTEM_TO_DAEMON_COMMON="
/etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
/etc/default/libvirt-guests
/etc/sasl2/libvirt.conf
"
DAEMON_SYSTEM_TO_DAEMON="
/etc/apparmor.d/usr.sbin.libvirtd
/etc/default/libvirtd
/etc/libvirt/libvirtd.conf
/etc/logrotate.d/libvirtd
"
DAEMON_SYSTEM_TO_DAEMON_LOG="
/etc/default/virtlogd
/etc/libvirt/virtlogd.conf
"
DAEMON_SYSTEM_TO_DAEMON_LOCK="
/etc/default/virtlockd
/etc/libvirt/virtlockd.conf
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_XEN="
/etc/libvirt/libxl-lockd.conf
/etc/libvirt/libxl-sanlock.conf
/etc/libvirt/libxl.conf
/etc/logrotate.d/libvirtd.libxl
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_LXC="
/etc/apparmor.d/abstractions/libvirt-lxc
/etc/apparmor.d/libvirt/TEMPLATE.lxc
/etc/libvirt/lxc.conf
/etc/logrotate.d/libvirtd.lxc
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_QEMU="
/etc/apparmor.d/abstractions/libvirt-qemu
/etc/apparmor.d/libvirt/TEMPLATE.qemu
/etc/libvirt/qemu-lockd.conf
/etc/libvirt/qemu-sanlock.conf
/etc/libvirt/qemu.conf
/etc/logrotate.d/libvirtd.qemu
"
DAEMON_SYSTEM_TO_DAEMON_DRIVER_NETWORK="
/etc/libvirt/network.conf
"
case "$1" in
install|upgrade)
prepare_conffile_transfer \
"/etc/libvirt/qemu/networks/default.xml" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-config-network" \
-- \
"$@"
for nwfilter in $NWFILTERS; do
prepare_conffile_transfer \
"/etc/libvirt/nwfilter/$nwfilter.xml" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-config-nwfilter" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_COMMON; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-common" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_LOG; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-log" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_LOCK; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-lock" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_XEN; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-xen" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_LXC; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-lxc" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_QEMU; do
prepare_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-qemu" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_TO_DAEMON_DRIVER_NETWORK; do
prepare_conffile_transfer \
"$conf" \
"10.4.0-1~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon-driver-network" \
-- \
"$@"
done
;;
abort-upgrade)
......
......@@ -14,21 +14,10 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
#DELETE_PROTECTIVE_DIVERSION#
#SYSTEMD_DAEMON_RELOAD#
#SYSTEMD_UNIT_RESTART_IF_ACTIVE#
DAEMON_SYSTEM_TO_DAEMON="
/etc/apparmor.d/usr.sbin.libvirtd
/etc/default/libvirtd
/etc/libvirt/libvirtd.conf
/etc/logrotate.d/libvirtd
"
DAEMON_SYSTEM_SYSV_TO_DAEMON="
/etc/init.d/libvirtd
"
DAEMON_UNITS="
libvirtd-admin.socket
libvirtd-ro.socket
......@@ -40,27 +29,6 @@ DAEMON_UNITS="
case "$1" in
configure)
for conf in $DAEMON_SYSTEM_TO_DAEMON; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system" \
"libvirt-daemon" \
-- \
"$@"
done
for conf in $DAEMON_SYSTEM_SYSV_TO_DAEMON; do
finish_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-daemon-system-sysv" \
"libvirt-daemon" \
-- \
"$@"
done
for unit in $DAEMON_UNITS; do
delete_protective_diversion \
"/lib/systemd/system/$unit" \
......
......@@ -14,18 +14,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#FINISH_CONFFILE_TRANSFER#
case "$1" in
configure)
finish_conffile_transfer \
"/etc/libvirt/virt-login-shell.conf" \
"6.0.0-0~" \
"6.9.0-2~" \
"libvirt-clients" \
"libvirt-login-shell" \
-- \
"$@"
;;
abort-upgrade|abort-remove|abort-deconfigure)
......
......@@ -16,24 +16,8 @@ set -e
# for details, see https://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#ABORT_CONFFILE_TRANSFER#
SANLOCK_TO_DAEMON_PLUGIN_SANLOCK="
/etc/cron.weekly/libvirt-sanlock
"
case "$1" in
abort-install|abort-upgrade)
for conf in $SANLOCK_TO_DAEMON_PLUGIN_SANLOCK; do
abort_conffile_transfer \
"$conf" \
"6.0.0-0~" \
"10.6.0-2~" \
"libvirt-sanlock" \
"libvirt-daemon-plugin-sanlock" \
-- \
"$@"
done
;;
remove|purge|upgrade|disappear|failed-upgrade)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment