[pve-devel] [PATCH kernel-meta] boot-tool: fix whitespace in generated loader configuration

[pve-devel] [PATCH kernel-meta] boot-tool: fix whitespace in generated loader configuration

[Oguz Bektas]

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}"
-- 
2.30.2

Re: [pve-devel] [PATCH kernel-meta] boot-tool: fix whitespace in generated loader configuration

[Stoiko Ivanov]

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}"

[pve-devel] applied: [PATCH kernel-meta] boot-tool: fix whitespace in generated loader configuration

[Thomas Lamprecht]

On 10.11.21 14:07, Oguz Bektas 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(-)
> 
>

applied, but reworked the commit message to clarify that this has no actual functional
impact (but still good to have to avoid confusion), thanks!