From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-kernel-meta v2] proxmox-boot: read only first line of /etc/kernel/cmdline
Date: Wed, 10 Nov 2021 16:25:10 +0100 [thread overview]
Message-ID: <20211110152510.3979872-1-s.ivanov@proxmox.com> (raw)
following the commit of removing the wrong indentation of the linux
and initrd lines - this commit strips empty lines (and leading
trailing whitespace) in /etc/kernel/cmdline.
I managed to reproduce the issue reported in the forum [0] by adding
empty lines to /etc/kernel/cmdline) - without this - systemd-boot
booted quite happily even with the indentation.
considered using perl -pe with multiline matching but thanks to
Thomas' suggestion went with the shell-builtin read.
the check for existance of 'root=' in the resulting CMDLINE was added,
since my test-system had an empty line in the beginning, which again
rendered it unbootable.
quickly tested on a VM.
[0]: https://forum.proxmox.com/threads/problem-with-proxmox-boot-tool.99043/
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
v1->v2:
* incorporated Dominik and Thomas' feedback (huge thanks for catching my
glitches!)
proxmox-boot/zz-proxmox-boot | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot
index 52171b2..26a9e7e 100755
--- a/proxmox-boot/zz-proxmox-boot
+++ b/proxmox-boot/zz-proxmox-boot
@@ -50,7 +50,9 @@ update_esps() {
exit 0
fi
if [ -f /etc/kernel/cmdline ]; then
- CMDLINE="$(cat /etc/kernel/cmdline)"
+ read -r CMDLINE < /etc/kernel/cmdline
+ echo ${CMDLINE} | grep -q 'root=' || \
+ { warn "No root= parameter in /etc/kernel/cmdline found!"; exit 1; }
else
warn "No /etc/kernel/cmdline found - falling back to /proc/cmdline"
# remove initrd entries
--
2.30.2
next reply other threads:[~2021-11-10 15:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 15:25 Stoiko Ivanov [this message]
2021-11-11 10:21 ` [pve-devel] applied: " Thomas Lamprecht
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=20211110152510.3979872-1-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