From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Oguz Bektas <o.bektas@proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH kernel-meta] boot-tool: fix whitespace in generated loader configuration
Date: Wed, 10 Nov 2021 15:19:10 +0100 [thread overview]
Message-ID: <20211110151910.2bb46160@rosa.proxmox.com> (raw)
In-Reply-To: <20211110130746.1025299-1-o.bektas@proxmox.com>
Huge thanks for addressing this and directly providing a patch (and sorry
for fat-fingering the indentation in the first place)
as discussed off-list - I was not able to reproduce the issue (of a
non-booting system) directly - so the indentation alone was not the
problem.
One thing that rendered my test-system unbootable was adding empty lines
to /etc/kernel/cmdline (and running p-b-t refresh) - I sent a short
follow-up for this.
In any case - your patch works as advertised:
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
On Wed, 10 Nov 2021 14:07:46 +0100
Oguz Bektas <o.bektas@proxmox.com> wrote:
> issue reported in forum [0]
>
> seems like it came in with 2a8a4b5e37e87a0a994fe3820b015e051e6259fb
>
> [0]: https://forum.proxmox.com/threads/problem-with-proxmox-boot-tool.99043/
>
> before:
> ========
> $ cat /mnt/foo/loader/entries/proxmox-5.11.22-7-pve.conf
> title Proxmox Virtual Environment
> version 5.11.22-7-pve
> options root=ZFS=rpool/ROOT/pve-1 boot=zfs iommu=pt
> linux /EFI/proxmox/5.11.22-7-pve/vmlinuz-5.11.22-7-pve
> initrd /EFI/proxmox/5.11.22-7-pve/initrd.img-5.11.22-7-pve
>
> after:
> ========
> $ proxmox-boot-tool refresh
> $ cat /mnt/foo/loader/entries/proxmox-5.11.22-7-pve.conf
> title Proxmox Virtual Environment
> version 5.11.22-7-pve
> options root=ZFS=rpool/ROOT/pve-1 boot=zfs iommu=pt
> linux /EFI/proxmox/5.11.22-7-pve/vmlinuz-5.11.22-7-pve
> initrd /EFI/proxmox/5.11.22-7-pve/initrd.img-5.11.22-7-pve
>
> Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> ---
> proxmox-boot/zz-proxmox-boot | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot
> index 4bd63a6..52171b2 100755
> --- a/proxmox-boot/zz-proxmox-boot
> +++ b/proxmox-boot/zz-proxmox-boot
> @@ -140,8 +140,8 @@ copy_and_config_kernels() {
> title ${LOADER_TITLE}
> version ${kver}
> options ${CMDLINE}
> - linux /${KERNEL_ESP_DIR}/vmlinuz-${kver}
> - initrd /${KERNEL_ESP_DIR}/initrd.img-${kver}
> + linux /${KERNEL_ESP_DIR}/vmlinuz-${kver}
> + initrd /${KERNEL_ESP_DIR}/initrd.img-${kver}
> EOF
> else
> warn " Copying kernel ${kver}"
next prev parent reply other threads:[~2021-11-10 14:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 13:07 Oguz Bektas
2021-11-10 14:19 ` Stoiko Ivanov [this message]
2021-11-11 10:20 ` [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=20211110151910.2bb46160@rosa.proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=o.bektas@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.