From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH zfsonlinux 4/6] d/libzfs7linux: update usr-merge-related maintainer scripts after trixie release (see: #1092598)
Date: Tue, 13 Jan 2026 15:07:12 +0100 [thread overview]
Message-ID: <20260113141037.3159275-5-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20260113141037.3159275-1-s.ivanov@proxmox.com>
clean cherry-pick from https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
(cherry picked from commit 3d8211b1b4d4f9f3d50d67cf41a27338effea360)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
...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
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2026-01-13 14:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 2/6] Bump SONAME to libzfs7 and libzpool7 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 3/6] d/: rename arcstat and arc_summary to zarcstat and zarcsummary Stoiko Ivanov
2026-01-13 14:07 ` Stoiko Ivanov [this message]
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 5/6] d/control: update usage of auto-generated fields Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 6/6] d/control: bump std-ver to 4.7.3 (no changes needed) Stoiko Ivanov
2026-01-13 18:12 ` [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260113141037.3159275-5-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox