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 AE361752B8 for ; Fri, 4 Jun 2021 15:50:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9CC3D1DF54 for ; Fri, 4 Jun 2021 15:50:02 +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 767171DD9F for ; Fri, 4 Jun 2021 15:49:51 +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 4FEE946723 for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:31 +0200 Message-Id: <20210604134946.152720-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 2 AWL -2.517 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SOMETLD_ARE_BAD_TLD 5 .stream, .trade, .pw, .top, .press, .guru, .casa & .date TLD Abuse SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [base.pw, cifsplugin.pm] Subject: [pve-devel] [PATCH/RFC storage 1/3] postinst: move cifs credential files into subdirectory upon update 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: Fri, 04 Jun 2021 13:50:32 -0000 and drop the compat code. Signed-off-by: Fabian Ebner --- PVE/Storage/CIFSPlugin.pm | 3 --- debian/postinst | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 debian/postinst diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm index be06cc7..9d69b01 100644 --- a/PVE/Storage/CIFSPlugin.pm +++ b/PVE/Storage/CIFSPlugin.pm @@ -59,9 +59,6 @@ sub get_cred_file { if (-e $cred_file) { return $cred_file; - } elsif (-e "/etc/pve/priv/${storeid}.cred") { - # FIXME: remove fallback with 7.0 by doing a rename on upgrade from 6.x - return "/etc/pve/priv/${storeid}.cred"; } return undef; } diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..e2453d2 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + configure) + if test -n "$2"; then + + # TODO: remove once PVE 7.0 is released + if dpkg --compare-versions "$2" 'lt' '7.0-3'; then + for file in /etc/pve/priv/*.cred; do + if [ -f "$file" ]; then + base=$(basename --suffix=".cred" "$file") + if [ -f "/etc/pve/priv/storage/$base.pw" ]; then + echo "Warning: found obsolete CIFS credentials file: $file" >&2 + echo "File: /etc/pve/priv/storage/$base.pw also exists" >&2 + else + cp "$file" "/etc/pve/priv/storage/$base.pw" && rm "$file" + fi + fi + done + fi + fi + ;; + +esac + +exit 0 -- 2.30.2