* [pve-devel] [PATCH v2 manager] postinst: migrate/update APT auth config
@ 2022-09-14 8:05 Fabian Grünbichler
2022-09-14 8:57 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Grünbichler @ 2022-09-14 8:05 UTC (permalink / raw)
To: pve-devel
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 <f.gruenbichler@proxmox.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH v2 manager] postinst: migrate/update APT auth config
2022-09-14 8:05 [pve-devel] [PATCH v2 manager] postinst: migrate/update APT auth config Fabian Grünbichler
@ 2022-09-14 8:57 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2022-09-14 8:57 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
Am 14/09/2022 um 10:05 schrieb Fabian Grünbichler:
> 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 <f.gruenbichler@proxmox.com>
> ---
>
> Notes:
> v2:
> - actually use final version of migrate_apt_auth_conf
> - read -r
>
> debian/postinst | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
>
applied, thanks! fyi, similar to PMG I also transformed that file to four spaces only
indentation in a followup, plus an extra patch adding an early return to set_lvm_conf,
avoiding an extra indent level for most of the function body.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-14 8:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-14 8:05 [pve-devel] [PATCH v2 manager] postinst: migrate/update APT auth config Fabian Grünbichler
2022-09-14 8:57 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox