From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 8FEE91FF13B for ; Tue, 13 Jan 2026 15:11:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 211141971E; Tue, 13 Jan 2026 15:11:20 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 13 Jan 2026 15:07:12 +0100 Message-ID: <20260113141037.3159275-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260113141037.3159275-1-s.ivanov@proxmox.com> References: <20260113141037.3159275-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768313399932 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux 4/6] d/libzfs7linux: update usr-merge-related maintainer scripts after trixie release (see: #1092598) X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" clean cherry-pick from https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Shengqi Chen (cherry picked from commit 3d8211b1b4d4f9f3d50d67cf41a27338effea360) Signed-off-by: Stoiko Ivanov --- ...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