From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A3EE81FF15C for ; Wed, 13 Nov 2024 20:04:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 216141C02B; Wed, 13 Nov 2024 20:04:12 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 13 Nov 2024 20:03:59 +0100 Message-Id: <20241113190359.686689-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.078 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pve-devel] [RFC ifupdown2] d/maintscripts: use postinst arguments to determine first install 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Following https://www.debian.org/doc/debian-policy/ap-flowcharts.html postinst gets called as 'postinst configure' w/o second argument on first installation, use that information instead of creating a flag-file in preinst. Technically this changes the semantics and the first-install parts will not be run, in case ifupdown2 had been installed on the system, but was subsequently removed, but not purged ('rc' in dpkg-output). Since the functionality was added quite a while ago (released with PVE 6.2 to support ovs-setups with ifupdown2 - the potential for regression should be limited. Originally introduced in: 849ae55de6454ea4631de0899182c148c954e46a Fixes: 8d5303c35044b612afc68eec1dc5bc265a5dd328 Signed-off-by: Stoiko Ivanov --- sending as RFC, as I'm not sure that the small cosmetic fix is worth the potetial regressions at all, but after spending a bit too long reading the commit-history and the debian-policy manual thought I'll send it anyways. (Tested with mmebstrap and in an install on top of debian) debian/ifupdown2.postinst | 3 +-- debian/ifupdown2.preinst | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 debian/ifupdown2.preinst diff --git a/debian/ifupdown2.postinst b/debian/ifupdown2.postinst index a22b825..f9a719c 100644 --- a/debian/ifupdown2.postinst +++ b/debian/ifupdown2.postinst @@ -111,11 +111,10 @@ case "$1" in process_udev chmod +x /usr/share/ifupdown2/__main__.py postinst_remove_diverts - if [ -f "/tmp/.ifupdown2-first-install" ] && [ ! -e /proxmox_install_mode ]; then + if [ -z "$2" ] && [ ! -e /proxmox_install_mode ]; then proxmox_compatibility echo "Reloading network config on first install" ifreload -a || report_warn "Reloading failed" - rm /tmp/.ifupdown2-first-install fi ;; diff --git a/debian/ifupdown2.preinst b/debian/ifupdown2.preinst deleted file mode 100644 index aa8653e..0000000 --- a/debian/ifupdown2.preinst +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - install) - touch /tmp/.ifupdown2-first-install - ;; - - upgrade|abort-upgrade) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel