From a2a166d93dba4c96511c9db29be0bccdde7cbeb2 Mon Sep 17 00:00:00 2001
From: "michael.hudson@canonical.com" <michael.hudson@canonical.com>
Date: Thu, 19 Feb 2026 13:49:51 +1300
Subject: [PATCH] Standardize whitespace in GRUB menu entry stanzas

Use consistent formatting across all architectures: 4-space indent,
two spaces after "linux", one space after "initrd". Also fix an extra
blank line before "fi" in amd64's UEFI section caused by f-string
interpolation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 live-build/isobuilder/boot/amd64.py   | 18 +++++++++---------
 live-build/isobuilder/boot/arm64.py   |  6 +++---
 live-build/isobuilder/boot/grub.py    |  2 +-
 live-build/isobuilder/boot/ppc64el.py |  2 +-
 live-build/isobuilder/boot/riscv64.py |  2 +-
 live-build/isobuilder/boot/uefi.py    |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/live-build/isobuilder/boot/amd64.py b/live-build/isobuilder/boot/amd64.py
index 11c1ce16..2630e634 100644
--- a/live-build/isobuilder/boot/amd64.py
+++ b/live-build/isobuilder/boot/amd64.py
@@ -95,8 +95,8 @@ class AMD64BootConfigurator(UEFIBootConfigurator):
             result += """\
 menuentry "Choose an Ubuntu version to install" {
     set gfxpayload=keep
-    linux    /casper/vmlinuz iso-chooser-menu ip=dhcp ---
-    initrd    /casper/initrd
+    linux  /casper/vmlinuz iso-chooser-menu ip=dhcp ---
+    initrd /casper/initrd
 }
 """
             return result
@@ -107,8 +107,8 @@ menuentry "Choose an Ubuntu version to install" {
         result += f"""\
 menuentry "Try or Install {self.humanproject}" {{
     set gfxpayload=keep
-    linux    /casper/vmlinuz {kernel_params}
-    initrd    /casper/initrd
+    linux  /casper/vmlinuz {kernel_params}
+    initrd /casper/initrd
 }}
 """
 
@@ -117,8 +117,8 @@ menuentry "Try or Install {self.humanproject}" {{
             result += f"""\
 menuentry "{self.humanproject} (safe graphics)" {{
     set gfxpayload=keep
-    linux    /casper/vmlinuz nomodeset {kernel_params}
-    initrd    /casper/initrd
+    linux  /casper/vmlinuz nomodeset {kernel_params}
+    initrd /casper/initrd
 }}
 """
 
@@ -130,8 +130,8 @@ menuentry "{self.humanproject} (safe graphics)" {{
             result += f"""\
 menuentry "OEM install (for manufacturers)" {{
     set gfxpayload=keep
-    linux    /casper/vmlinuz {oem_kernel_params}
-    initrd    /casper/initrd
+    linux  /casper/vmlinuz {oem_kernel_params}
+    initrd /casper/initrd
 }}
 """
 
@@ -161,7 +161,7 @@ menuentry "{self.humanproject} with the HWE kernel" {{
         result += f"""\
 grub_platform
 if [ "$grub_platform" = "efi" ]; then
-{uefi_menu_entries}
+{uefi_menu_entries}\
 fi
 """
 
diff --git a/live-build/isobuilder/boot/arm64.py b/live-build/isobuilder/boot/arm64.py
index effcaeda..8c94db77 100644
--- a/live-build/isobuilder/boot/arm64.py
+++ b/live-build/isobuilder/boot/arm64.py
@@ -54,9 +54,9 @@ if [ $? = 0 ]; then
 fi
 
 menuentry "Try or Install {self.humanproject}" {{
-\tset gfxpayload=keep
-\tlinux\t/casper/vmlinuz $cmdline {kernel_params} console=tty0
-\tinitrd\t/casper/initrd
+    set gfxpayload=keep
+    linux  /casper/vmlinuz $cmdline {kernel_params} console=tty0
+    initrd /casper/initrd
 }}
 """
 
diff --git a/live-build/isobuilder/boot/grub.py b/live-build/isobuilder/boot/grub.py
index 878c9c4a..1996b186 100644
--- a/live-build/isobuilder/boot/grub.py
+++ b/live-build/isobuilder/boot/grub.py
@@ -74,7 +74,7 @@ set menu_color_highlight=black/light-gray
         return f"""\
 menuentry "{self.humanproject} with the HWE kernel" {{
     set gfxpayload=keep
-    linux /casper/hwe-{kernel_name} {extra_params}{kernel_params}
+    linux  /casper/hwe-{kernel_name} {extra_params}{kernel_params}
     initrd /casper/hwe-initrd
 }}
 """
diff --git a/live-build/isobuilder/boot/ppc64el.py b/live-build/isobuilder/boot/ppc64el.py
index 94450d00..8782d352 100644
--- a/live-build/isobuilder/boot/ppc64el.py
+++ b/live-build/isobuilder/boot/ppc64el.py
@@ -63,7 +63,7 @@ class PPC64ELBootConfigurator(GrubBootConfigurator):
         result += f"""\
 menuentry "Try or Install {self.humanproject}" {{
     set gfxpayload=keep
-    linux /casper/vmlinux quiet {kernel_params}
+    linux  /casper/vmlinux quiet {kernel_params}
     initrd /casper/initrd
 }}
 """
diff --git a/live-build/isobuilder/boot/riscv64.py b/live-build/isobuilder/boot/riscv64.py
index 7b41640d..2859ee8a 100644
--- a/live-build/isobuilder/boot/riscv64.py
+++ b/live-build/isobuilder/boot/riscv64.py
@@ -134,7 +134,7 @@ class RISCV64BootConfigurator(GrubBootConfigurator):
         result += f"""\
 menuentry "Try or Install {self.humanproject}" {{
     set gfxpayload=keep
-    linux /casper/vmlinux efi=debug sysctl.kernel.watchdog_thresh=60 ---
+    linux  /casper/vmlinux efi=debug sysctl.kernel.watchdog_thresh=60 ---
     initrd /casper/initrd
 }}
 """
diff --git a/live-build/isobuilder/boot/uefi.py b/live-build/isobuilder/boot/uefi.py
index 8c321273..9483409a 100644
--- a/live-build/isobuilder/boot/uefi.py
+++ b/live-build/isobuilder/boot/uefi.py
@@ -126,10 +126,10 @@ class UEFIBootConfigurator(GrubBootConfigurator):
         """Return UEFI firmware menu entries."""
         return """\
 menuentry 'Boot from next volume' {
-\texit 1
+    exit 1
 }
 menuentry 'UEFI Firmware Settings' {
-\tfwsetup
+    fwsetup
 }
 """