From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B698673237 for ; Thu, 17 Jun 2021 15:53:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ACF941C66C for ; Thu, 17 Jun 2021 15:52:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C4CE41C5E0 for ; Thu, 17 Jun 2021 15:52:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9F7E846768 for ; Thu, 17 Jun 2021 15:52:48 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 17 Jun 2021 15:52:16 +0200 Message-Id: <20210617135223.23472-10-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210617135223.23472-1-s.ivanov@proxmox.com> References: <20210617135223.23472-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.752 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 09/16] Adjust zed.d symlink-preservation 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: , X-List-Received-Date: Thu, 17 Jun 2021 13:53:21 -0000 Closes BTS#983401. - Overwrite dangling symlinks on install - Does not clobber symlinks on removal Signed-off-by: Antonio Russo (cherry picked from commit b024d59f5976ea75ac9a0b48612b7032d24513ee) Signed-off-by: Stoiko Ivanov --- debian/zfs-zed.postinst | 2 +- debian/zfs-zed.prerm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/zfs-zed.postinst b/debian/zfs-zed.postinst index 93325438..a615eec9 100644 --- a/debian/zfs-zed.postinst +++ b/debian/zfs-zed.postinst @@ -8,7 +8,7 @@ etcd="/etc/zfs/zed.d" while read -r file ; do etcfile="${etcd}/${file}" [ -e "${etcfile}" ] && continue - ln -s "${zedd}/${file}" "${etcfile}" + ln -sfT "${zedd}/${file}" "${etcfile}" done < "${zedd}/DEFAULT-ENABLED" # remove the overrides created in prerm diff --git a/debian/zfs-zed.prerm b/debian/zfs-zed.prerm index fca0f4a7..b8340df5 100644 --- a/debian/zfs-zed.prerm +++ b/debian/zfs-zed.prerm @@ -7,8 +7,8 @@ etcd="/etc/zfs/zed.d" if [ "$1" != "failed-upgrade" ] && [ -d "${etcd}" ] && [ -d "${zedd}" ] ; then while read -r file ; do etcfile="${etcd}/${file}" - [ -e "${etcfile}" ] && continue - ln -s /dev/null "${etcfile}" + ( [ -L "${etcfile}" ] || [ -e "${etcfile}" ] ) && continue + ln -sT /dev/null "${etcfile}" done < "${zedd}/DEFAULT-ENABLED" fi -- 2.20.1