From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 83F1B1FF16F for <inbox@lore.proxmox.com>; Tue, 27 May 2025 18:13:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F401F1BA2F; Tue, 27 May 2025 18:13:35 +0200 (CEST) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 27 May 2025 18:12:39 +0200 Message-Id: <20250527161243.918116-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250527161243.918116-1-s.ivanov@proxmox.com> References: <20250527161243.918116-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 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 1/5] cherry-pick usr-merge fix for libzfs6linux X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> moving file canonical locations from e.g. /lib to /usr/lib (usr-merge) while renaming a package (libzfs4linux -> libzfs6linux) could result in file deletions during upgrades. The following workaround has been used in debian upstream. see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1092598 for the details. based on commit 0431247714965007bc156fd57852689b395b2bae https://salsa.debian.org/zfsonlinux-team/zfs/ Originally-by: Shengqi Chen <harry-chen@outlook.com> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- debian/libzfs6linux.postrm | 15 +++++++++++++++ debian/libzfs6linux.preinst | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 debian/libzfs6linux.postrm create mode 100644 debian/libzfs6linux.preinst diff --git a/debian/libzfs6linux.postrm b/debian/libzfs6linux.postrm new file mode 100644 index 000000000..ae6478653 --- /dev/null +++ b/debian/libzfs6linux.postrm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if test "$1" = remove; then + # DEP17 P1 M8. Clean up after libzfs6linux.preinst. This code should be + # removed once the diversions are deleted via postinst. + 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 +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/libzfs6linux.preinst b/debian/libzfs6linux.preinst new file mode 100644 index 000000000..6d1870785 --- /dev/null +++ b/debian/libzfs6linux.preinst @@ -0,0 +1,16 @@ +#!/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.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel