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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D0C4B9B77A for ; Tue, 21 Nov 2023 08:53:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B3F2B3E9A for ; Tue, 21 Nov 2023 08:53:11 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 21 Nov 2023 08:53:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 79D854094A for ; Tue, 21 Nov 2023 08:53:10 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 21 Nov 2023 08:53:05 +0100 Message-Id: <20231121075305.3531240-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.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.065 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox-kernel-helper] grub-wrapper: don't fail on reinit/refresh error 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: Tue, 21 Nov 2023 07:53:11 -0000 these can happen for example if the system - is set up to boot using systemd-boot - but grub updates trigger a call to "grub-install" - and systemd-boot is not installed in this case, "proxmox-boot-tool reinit" will fail because of the lack of "systemd-boot", and the upgrade triggering the grub-install call would error out. all the error messages/warnings are still printed and hopefully noticed. Signed-off-by: Fabian Grünbichler --- src/bin/grub-install-wrapper | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/grub-install-wrapper b/src/bin/grub-install-wrapper index 97649a4..9264303 100755 --- a/src/bin/grub-install-wrapper +++ b/src/bin/grub-install-wrapper @@ -10,8 +10,9 @@ if proxmox-boot-tool status --quiet; then MARKER_FILE="/tmp/proxmox-boot-tool.dpkg.marker" if [ ! -e "$MARKER_FILE" ]; then warn "This system is booted via proxmox-boot-tool, running proxmox-boot-tool init for all configured bootdisks" - proxmox-boot-tool reinit - proxmox-boot-tool refresh + # can fail for various reasons, but we don't want to fail the upgrade.. + proxmox-boot-tool reinit || true + proxmox-boot-tool refresh || true touch "$MARKER_FILE" exit 0 else -- 2.39.2