From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stoiko Ivanov <s.ivanov@proxmox.com>
Subject: Re: [pve-devel] [PATCH pve-kernel-meta] proxmox-boot: trim /etc/kernel/cmdline before appending
Date: Wed, 10 Nov 2021 15:28:22 +0100 [thread overview]
Message-ID: <d01179d9-749d-b45a-d0fb-46746a13af65@proxmox.com> (raw)
In-Reply-To: <20211110141511.3617927-1-s.ivanov@proxmox.com>
comment inline
On 11/10/21 15:15, Stoiko Ivanov wrote:
> 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.
>
> 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>
> ---
> proxmox-boot/zz-proxmox-boot | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot
> index 52171b2..2356c74 100755
> --- a/proxmox-boot/zz-proxmox-boot
> +++ b/proxmox-boot/zz-proxmox-boot
> @@ -50,7 +50,7 @@ update_esps() {
> exit 0
> fi
> if [ -f /etc/kernel/cmdline ]; then
> - CMDLINE="$(cat /etc/kernel/cmdline)"
> + CMDLINE="$(sed -re '/^\s*$/d;s/^\s+(\S*)\s+$/\1/g' /etc/kernel/cmdline)"
while the first part of the regex looks good (delete all lines that
only contain whitespace (or nothing), the second part will often not
trigger since there is not *only* non-whitespace in the middle?
should it not be more like:
'^\s+(.*?)\s+$/\1/g' ?
> else
> warn "No /etc/kernel/cmdline found - falling back to /proc/cmdline"
> # remove initrd entries
>
next prev parent reply other threads:[~2021-11-10 14:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 14:15 Stoiko Ivanov
2021-11-10 14:28 ` Dominik Csapak [this message]
2021-11-10 14:48 ` 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=d01179d9-749d-b45a-d0fb-46746a13af65@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.ivanov@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