clean cherry-pick from https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Shengqi Chen <[email protected]> (cherry picked from commit 3d8211b1b4d4f9f3d50d67cf41a27338effea360) Signed-off-by: Stoiko Ivanov <[email protected]> --- ...libzfs7linux.postrm => libzfs7linux.postinst} | 3 ++- debian/libzfs7linux.preinst | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) rename debian/{libzfs7linux.postrm => libzfs7linux.postinst} (79%) delete mode 100644 debian/libzfs7linux.preinst diff --git a/debian/libzfs7linux.postrm b/debian/libzfs7linux.postinst similarity index 79% rename from debian/libzfs7linux.postrm rename to debian/libzfs7linux.postinst index ae6478653..14f9baec9 100644 --- a/debian/libzfs7linux.postrm +++ b/debian/libzfs7linux.postinst @@ -2,9 +2,10 @@ set -e -if test "$1" = remove; then +if test "$1" = configure; then # DEP17 P1 M8. Clean up after libzfs6linux.preinst. This code should be # removed once the diversions are deleted via postinst. + # see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1092598 for lib in zfs_core.so.3 zfs_core.so.3.0.0; do dpkg-divert --package libzfs6linux --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/lib$lib" done diff --git a/debian/libzfs7linux.preinst b/debian/libzfs7linux.preinst deleted file mode 100644 index 6d1870785..000000000 --- a/debian/libzfs7linux.preinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -if test "$1" = install -o "$1" = upgrade; then - # DEP17 P1 M8: Divert aliased files to avoid their removal deleting the - # moved ones. These diversions should be removed via postinst once - # trixie is released. - for lib in zfs_core.so.3 zfs_core.so.3.0.0; do - dpkg-divert --package libzfs6linux --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/lib$lib" - done -fi - -#DEBHELPER# - -exit 0 -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
