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 CC55362778 for ; Fri, 11 Feb 2022 16:16:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BB56B2BCCA for ; Fri, 11 Feb 2022 16:16:05 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9E5752BC8C for ; Fri, 11 Feb 2022 16:16:03 +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 74A4646E02 for ; Fri, 11 Feb 2022 16:16:03 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 11 Feb 2022 16:15:44 +0100 Message-Id: <20220211151547.181259-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220211151547.181259-1-s.ivanov@proxmox.com> References: <20220211151547.181259-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.242 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 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 pve-kernel-meta v3 4/4] proxmox-boot: add pin/unpin functionality for non-p-b-t systems 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: Fri, 11 Feb 2022 15:16:05 -0000 While running `update-grub` directly in this case is a divergence from the semantics of the command when p-b-t handles booting it makes the cleanup in the `next-boot` case a bit tidier. fetching the next-boot version explicitly again before setting the provided version is to cover the sequence: p-b-t kernel pin --next-boot ; p-b-t kernel pin Signed-off-by: Stoiko Ivanov --- bin/proxmox-boot-tool | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/bin/proxmox-boot-tool b/bin/proxmox-boot-tool index 90c4f5d..178b6fb 100755 --- a/bin/proxmox-boot-tool +++ b/bin/proxmox-boot-tool @@ -437,15 +437,33 @@ pin_kernel() { exit 1 fi echo "$ver" > "$pin_file" - echo "Set kernel '$ver' in $pin_file. Use the 'refresh' command to update the ESPs." + + if [ -f "${ESP_LIST}" ]; then + echo "Set kernel '$ver' in $pin_file. Use the 'refresh' command to update the ESPs." + else + next_boot_ver=$(get_first_line "${NEXT_BOOT_PIN}") + pin_ver="${next_boot_ver:-$ver}" + echo "Setting '$pin_ver' as grub default entry and running update-grub." + set_grub_default "$pin_ver" + update-grub + fi } unpin_kernel() { rm -f "$NEXT_BOOT_PIN" - echo "Removed $NEXT_BOOT_PIN. Use the 'refresh' command to update the ESPs." + echo "Removed $NEXT_BOOT_PIN." if [ -z "$1" ]; then rm -f "$PINNED_KERNEL_CONF" - echo "Removed $PINNED_KERNEL_CONF. Use the 'refresh' command to update the ESPs." + echo "Removed $PINNED_KERNEL_CONF." + fi + + if [ -f "${ESP_LIST}" ]; then + echo "Use the 'refresh' command to update the ESPs." + else + echo "Reset default grub entry and running update-grub." + pinned_kernel=$(get_first_line "${PINNED_KERNEL_CONF}") + set_grub_default "$pinned_kernel" + update-grub fi } -- 2.30.2