From 44ad8616fc71dc577a8a09be7cd05a034606feeb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Apr 2024 19:41:48 +0200 Subject: Merging debian version 2.40-7. Signed-off-by: Daniel Baumann --- debian/util-linux-extra.preinst | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'debian/util-linux-extra.preinst') diff --git a/debian/util-linux-extra.preinst b/debian/util-linux-extra.preinst index edd6522..0d9e13a 100755 --- a/debian/util-linux-extra.preinst +++ b/debian/util-linux-extra.preinst @@ -2,15 +2,12 @@ set -e -# begin-remove-after: released:trixie -if test "$1" = configure; then - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.cramfs.usr-is-merged --remove /sbin/fsck.cramfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.minix.usr-is-merged --remove /sbin/fsck.minix - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.bfs.usr-is-merged --remove /sbin/mkfs.bfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.cramfs.usr-is-merged --remove /sbin/mkfs.cramfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.minix.usr-is-merged --remove /sbin/mkfs.minix +if test "$1" = upgrade || test "$1" = install; then + dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.cramfs.usr-is-merged --add /sbin/fsck.cramfs + dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.minix.usr-is-merged --add /sbin/fsck.minix + dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.bfs.usr-is-merged --add /sbin/mkfs.bfs + dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.cramfs.usr-is-merged --add /sbin/mkfs.cramfs + dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.minix.usr-is-merged --add /sbin/mkfs.minix fi -# end-remove-after #DEBHELPER# - -- cgit v1.2.3