From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-kernel-meta v2 4/4] proxmox-boot: add pin/unpin functionality for non-p-b-t systems
Date: Fri, 4 Feb 2022 19:45:36 +0100 [thread overview]
Message-ID: <20220204184538.3139247-5-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20220204184538.3139247-1-s.ivanov@proxmox.com>
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.
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
bin/proxmox-boot-tool | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/bin/proxmox-boot-tool b/bin/proxmox-boot-tool
index 5d878f6..222d131 100755
--- a/bin/proxmox-boot-tool
+++ b/bin/proxmox-boot-tool
@@ -422,15 +422,31 @@ pin_kernel() {
exit 1
fi
echo "$ver" > "$pin_file"
- echo "Set kernel '$ver' $PINNED_KERNEL_CONF. 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
+ echo "Setting '$ver' as grub default entry and running update-grub."
+ set_grub_default "$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
next prev parent reply other threads:[~2022-02-04 18:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 18:45 [pve-devel] [PATCH pve-kernel-meta/proxmox-ve v2] proxmox-boot: add kernel pinning functionality (#3761) Stoiko Ivanov
2022-02-04 18:45 ` [pve-devel] [PATCH pve-kernel-meta v2 1/4] proxmox-boot: return empty if file does not exist in get_first_line Stoiko Ivanov
2022-02-04 18:45 ` [pve-devel] [PATCH pve-kernel-meta v2 2/4] proxmox-boot: fix #3671 add pin/unpin for kernel-version Stoiko Ivanov
[not found] ` <<20220204184538.3139247-3-s.ivanov@proxmox.com>
2022-02-10 10:58 ` Fabian Grünbichler
2022-02-04 18:45 ` [pve-devel] [PATCH pve-kernel-meta v2 3/4] proxmox-boot: add kernel next-boot command Stoiko Ivanov
[not found] ` <<20220204184538.3139247-4-s.ivanov@proxmox.com>
2022-02-10 10:58 ` Fabian Grünbichler
2022-02-04 18:45 ` Stoiko Ivanov [this message]
2022-02-04 18:45 ` [pve-devel] [PATCH proxmox-ve v2 1/2] apt-hook: fix perlcritic warnings Stoiko Ivanov
2022-02-04 18:45 ` [pve-devel] [PATCH proxmox-ve v2 2/2] apt-hook: add check preventing the removal of pinned kernels Stoiko Ivanov
2022-02-09 17:22 ` Stoiko Ivanov
[not found] ` <<20220204184538.3139247-1-s.ivanov@proxmox.com>
2022-02-10 10:57 ` [pve-devel] [PATCH pve-kernel-meta/proxmox-ve v2] proxmox-boot: add kernel pinning functionality (#3761) Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220204184538.3139247-5-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox