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 057C170BA2 for ; Tue, 8 Jun 2021 15:18:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E3D211B14C for ; Tue, 8 Jun 2021 15:18:25 +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 532731B141 for ; Tue, 8 Jun 2021 15:18:22 +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 25A9846169 for ; Tue, 8 Jun 2021 15:18:22 +0200 (CEST) Date: Tue, 08 Jun 2021 15:18:14 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210604134946.152720-1-f.ebner@proxmox.com> <20210604134946.152720-8-f.ebner@proxmox.com> In-Reply-To: <20210604134946.152720-8-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1623157458.jdlco682hi.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 1 AWL -1.588 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 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, proxmox.com] Subject: Re: [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: Tue, 08 Jun 2021 13:18:56 -0000 On June 4, 2021 3:49 pm, Fabian Ebner wrote: > and drop the compat code. >=20 > 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 >=20 > 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 { > =20 > 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 s/7/8/ ? because we need to do this renaming on all upgrades of 6.x to 7.x, no=20 matter how far along in the 7.x release we are.. for the upgrade from=20 7.x to 8.x we can then be sure that the only such files are leftover=20 garbage ;) > + if dpkg --compare-versions "$2" 'lt' '7.0-3'; then > + for file in /etc/pve/priv/*.cred; do > + if [ -f "$file" ]; then > + base=3D$(basename --suffix=3D".cred" "$file") > + if [ -f "/etc/pve/priv/storage/$base.pw" ]; then > + echo "Warning: found obsolete CIFS credentials f= ile: $file" >&2 > + echo "File: /etc/pve/priv/storage/$base.pw also = exists" >&2 > + else > + cp "$file" "/etc/pve/priv/storage/$base.pw" && r= m "$file" why not 'mv'? should we maybe print an info in both cases? e.g. Warning: found possibly obsolete CIFS credentials file '$file', but '...' a= lready exists. and Info: found CIFS credentials file '$file', moving to '...'. > + fi > + fi > + done > + fi > + fi > + ;; > + > +esac > + > +exit 0 > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20