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 CE1E498734 for ; Mon, 9 Oct 2023 09:07:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A899213FD2 for ; Mon, 9 Oct 2023 09:07:27 +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 ; Mon, 9 Oct 2023 09:07:26 +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 5410E435FD for ; Mon, 9 Oct 2023 09:07:26 +0200 (CEST) Message-ID: <6f2bca54-e79d-4854-9670-2b704762c537@proxmox.com> Date: Mon, 9 Oct 2023 09:07:25 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion , Stoiko Ivanov References: <20231004120558.382180-1-s.ivanov@proxmox.com> <20231004120558.382180-3-s.ivanov@proxmox.com> Content-Language: en-US From: Friedrich Weber In-Reply-To: <20231004120558.382180-3-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.149 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH 2/2] proxmox-boot-tool: check if correct grub metapackage is installed 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: Mon, 09 Oct 2023 07:07:57 -0000 On 04/10/2023 14:05, Stoiko Ivanov wrote: > diff --git a/src/proxmox-boot/zz-proxmox-boot b/src/proxmox-boot/zz-proxmox-boot > index 1adc1b1..0d08dbf 100755 > --- a/src/proxmox-boot/zz-proxmox-boot > +++ b/src/proxmox-boot/zz-proxmox-boot > @@ -215,6 +215,23 @@ disable_systemd_boot_hook() { > > } > > +check_grub_efi_package() { > + > + if [ -f "${ESP_LIST}" ]; then > + return > + fi > + > + if [ ! -d /sys/firmware/efi ]; then > + return > + fi > + > + if [ ! -f /usr/share/doc/grub-efi-amd64/changelog.Debian.gz ]; then > + return > + fi If I understand correctly, this check needs to be inverted, since we do want to warn if grub-efi-amd64 is *not* installed? (only noticed because my UEFI-based test machine did not print the warning below on upgrade) > + warn "uefi-booted system, without grub-efi-amd64 package - /boot/efi will not be updated" > + > +} > + > set -- $DEB_MAINT_PARAMS > mode="${1#\'}" > mode="${mode%\'}" > @@ -228,6 +245,7 @@ case $0:$mode in > BOOT_KVERS="$(boot_kernel_list "$@")" > update_esps > disable_systemd_boot_hook > + check_grub_efi_package > ;; > */postrm.d/*:|*/postrm.d/*:remove) > reexec_in_mountns "$@" > @@ -235,6 +253,7 @@ case $0:$mode in > BOOT_KVERS="$(boot_kernel_list)" > update_esps > disable_systemd_boot_hook > + check_grub_efi_package > ;; > esac >