Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-02-24 10:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardize whitespace in GRUB menu entry stanzas

Browse Source 
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>
This commit is contained in:
michael.hudson@canonical.com 2026-02-19 13:49:51 +13:00
parent a6466ab0a3
commit a2a166d93d
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
live-build/isobuilder/boot/amd64.py
View File

@ -95,8 +95,8 @@ class AMD64BootConfigurator(UEFIBootConfigurator):
result += """\ result += """\
menuentry "Choose an Ubuntu version to install" { menuentry "Choose an Ubuntu version to install" {
set gfxpayload=keep set gfxpayload=keep
linux /casper/vmlinuz iso-chooser-menu ip=dhcp --- linux /casper/vmlinuz iso-chooser-menu ip=dhcp ---
initrd /casper/initrd initrd /casper/initrd
} }
""" """
return result return result
@ -107,8 +107,8 @@ menuentry "Choose an Ubuntu version to install" {
result += f"""\ result += f"""\
menuentry "Try or Install {self.humanproject}" {{ menuentry "Try or Install {self.humanproject}" {{
set gfxpayload=keep set gfxpayload=keep
linux /casper/vmlinuz {kernel_params} linux /casper/vmlinuz {kernel_params}
initrd /casper/initrd initrd /casper/initrd
}} }}
""" """
@ -117,8 +117,8 @@ menuentry "Try or Install {self.humanproject}" {{
result += f"""\ result += f"""\
menuentry "{self.humanproject} (safe graphics)" {{ menuentry "{self.humanproject} (safe graphics)" {{
set gfxpayload=keep set gfxpayload=keep
linux /casper/vmlinuz nomodeset {kernel_params} linux /casper/vmlinuz nomodeset {kernel_params}
initrd /casper/initrd initrd /casper/initrd
}} }}
""" """
@ -130,8 +130,8 @@ menuentry "{self.humanproject} (safe graphics)" {{
result += f"""\ result += f"""\
menuentry "OEM install (for manufacturers)" {{ menuentry "OEM install (for manufacturers)" {{
set gfxpayload=keep set gfxpayload=keep
linux /casper/vmlinuz {oem_kernel_params} linux /casper/vmlinuz {oem_kernel_params}
initrd /casper/initrd initrd /casper/initrd
}} }}
""" """
@ -161,7 +161,7 @@ menuentry "{self.humanproject} with the HWE kernel" {{
result += f"""\ result += f"""\
grub_platform grub_platform
if [ "$grub_platform" = "efi" ]; then if [ "$grub_platform" = "efi" ]; then
{uefi_menu_entries} {uefi_menu_entries}\
fi fi
""" """

6
live-build/isobuilder/boot/arm64.py
View File

@ -54,9 +54,9 @@ if [ $? = 0 ]; then
fi fi
menuentry "Try or Install {self.humanproject}" {{ menuentry "Try or Install {self.humanproject}" {{
\tset gfxpayload=keep set gfxpayload=keep
\tlinux\t/casper/vmlinuz $cmdline {kernel_params} console=tty0 linux /casper/vmlinuz $cmdline {kernel_params} console=tty0
\tinitrd\t/casper/initrd initrd /casper/initrd
}} }}
""" """

2
live-build/isobuilder/boot/grub.py
View File

@ -74,7 +74,7 @@ set menu_color_highlight=black/light-gray
return f"""\ return f"""\
menuentry "{self.humanproject} with the HWE kernel" {{ menuentry "{self.humanproject} with the HWE kernel" {{
set gfxpayload=keep 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 initrd /casper/hwe-initrd
}} }}
""" """

2
live-build/isobuilder/boot/ppc64el.py
View File

@ -63,7 +63,7 @@ class PPC64ELBootConfigurator(GrubBootConfigurator):
result += f"""\ result += f"""\
menuentry "Try or Install {self.humanproject}" {{ menuentry "Try or Install {self.humanproject}" {{
set gfxpayload=keep set gfxpayload=keep
linux /casper/vmlinux quiet {kernel_params} linux /casper/vmlinux quiet {kernel_params}
initrd /casper/initrd initrd /casper/initrd
}} }}
""" """

2
live-build/isobuilder/boot/riscv64.py
View File

@ -134,7 +134,7 @@ class RISCV64BootConfigurator(GrubBootConfigurator):
result += f"""\ result += f"""\
menuentry "Try or Install {self.humanproject}" {{ menuentry "Try or Install {self.humanproject}" {{
set gfxpayload=keep 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 initrd /casper/initrd
}} }}
""" """

4
live-build/isobuilder/boot/uefi.py
View File

@ -126,10 +126,10 @@ class UEFIBootConfigurator(GrubBootConfigurator):
"""Return UEFI firmware menu entries.""" """Return UEFI firmware menu entries."""
return """\ return """\
menuentry 'Boot from next volume' { menuentry 'Boot from next volume' {
\texit 1 exit 1
} }
menuentry 'UEFI Firmware Settings' { menuentry 'UEFI Firmware Settings' {
\tfwsetup fwsetup
} }
""" """