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 BD11A70D38 for ; Wed, 9 Jun 2021 08:35:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0E8C21003 for ; Wed, 9 Jun 2021 08:35:40 +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 C74F120FF8 for ; Wed, 9 Jun 2021 08:35:39 +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 98BB442A1D for ; Wed, 9 Jun 2021 08:35:39 +0200 (CEST) To: pve-devel@lists.proxmox.com References: <20210604134946.152720-1-f.ebner@proxmox.com> <20210604134946.152720-8-f.ebner@proxmox.com> <1623157458.jdlco682hi.astroid@nora.none> From: Fabian Ebner Message-ID: <98846101-69d2-2a09-c9ed-e2c8298009a5@proxmox.com> Date: Wed, 9 Jun 2021 08:35:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <1623157458.jdlco682hi.astroid@nora.none> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -1.953 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_ASCII_DIVIDERS 0.8 Spam that uses ascii formatting tricks 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Wed, 09 Jun 2021 06:35:40 -0000 Am 08.06.21 um 15:18 schrieb Fabian Grünbichler: > On June 4, 2021 3:49 pm, Fabian Ebner wrote: >> 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 > > s/7/8/ ? > > because we need to do this renaming on all upgrades of 6.x to 7.x, no > matter how far along in the 7.x release we are.. for the upgrade from > 7.x to 8.x we can then be sure that the only such files are leftover > garbage ;) > Right, it's not like everybody has to go through a specific version. >> + 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" > > why not 'mv'? > Bad muscle memory. I got used to this for other scenarios, but since it's only a single file and no file-system boundaries are involved here, mv is of course better. > should we maybe print an info in both cases? e.g. > > Warning: found possibly obsolete CIFS credentials file '$file', but '...' already exists. > > and > > Info: found CIFS credentials file '$file', moving to '...'. > Ok, sure. >> + fi >> + fi >> + done >> + fi >> + fi >> + ;; >> + >> +esac >> + >> +exit 0 >> -- >> 2.30.2 >> >> >> >> _______________________________________________ >> pve-devel mailing list >> pve-devel@lists.proxmox.com >> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >> >> >> > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > >