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 5C1ED92B1A for ; Wed, 14 Sep 2022 10:06:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 59F102957A for ; Wed, 14 Sep 2022 10:06:00 +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 for ; Wed, 14 Sep 2022 10:05:59 +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 10D6C437D2 for ; Wed, 14 Sep 2022 10:05:59 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 14 Sep 2022 10:05:54 +0200 Message-Id: <20220914080554.2113739-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pve-devel] [PATCH v2 manager] postinst: migrate/update APT auth config 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, 14 Sep 2022 08:06:00 -0000 missed when switching over to Proxmox::RS::Subscription, which stores the same info in the product-specific /etc/apt/auth.conf.d/pve.conf . the top-level file might contain non-PVE-managed entries, so only remove entries matching "our" machine. Signed-off-by: Fabian Grünbichler --- Notes: v2: - actually use final version of migrate_apt_auth_conf - read -r debian/postinst | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/debian/postinst b/debian/postinst index 7be1aa3d..5ea79a6d 100755 --- a/debian/postinst +++ b/debian/postinst @@ -62,6 +62,36 @@ EOF fi } +migrate_apt_auth_conf() { + output="" + removed="" + match=0 + + while read -r l; do + if echo "$l" | grep -q "^machine enterprise.proxmox.com/debian/pve"; then + match=1 + elif echo "$l" | grep -q "machine"; then + match=0 + fi + + if test "$match" = "1"; then + removed="$removed\n$l" + else + output="$output\n$l" + fi + done < /etc/apt/auth.conf + + if test -n "$removed"; then + if test ! -e /etc/apt/auth.conf.d/pve.conf; then + echo "Migrating APT auth config for enterprise.proxmox.com to /etc/apt/auth.conf.d/pve.conf .." + echo "$removed" > /etc/apt/auth.conf.d/pve.conf + else + echo "Removing stale APT auth config from /etc/apt/auth.conf" + fi + echo "$output" > /etc/apt/auth.conf + fi +} + case "$1" in triggered) # We don't print a status message here, as dpkg already said @@ -190,6 +220,12 @@ case "$1" in fi done fi + + if test ! -e /proxmox_install_mode && test -n "$2" && dpkg --compare-versions "$2" 'lt' '7.2.11~'; then + if test -e /etc/apt/auth.conf ; then + migrate_apt_auth_conf + fi + fi ;; abort-upgrade|abort-remove|abort-deconfigure) -- 2.30.2