Skip to content

M
mkimage-profiles
Commit c25d9ab9 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

grub: drop $linux_suffix in *.cfg

This is not required for grub >= 2.04.
parent cc3f622f
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 48 deletions
features.in/grub/cfg.in/00defaults.cfg
View file @ c25d9ab9
...@@ -13,10 +13,6 @@ insmod normal ...@@ -13,10 +13,6 @@ insmod normal
insmod test insmod test
set timeout=@timeout@ set timeout=@timeout@
if [ "$grub_platform" = "efi" ]; then set EFI_BOOTARGS='@efi_bootargs@'; fi if [ "$grub_platform" = "efi" ]; then set EFI_BOOTARGS='@efi_bootargs@'; fi
if [ "$grub_platform" = "efi" -a "$grub_cpu" = "x86_64" ]; then
set linux_suffix='efi'
fi
if [ "$grub_platform" = "pc" ]; then set linux_suffix='16'; fi
if [ ! "$lang" ]; then lang=@LOCALE@; fi if [ ! "$lang" ]; then lang=@LOCALE@; fi
if [ -s $pfxfat/grubenv ]; then if [ -s $pfxfat/grubenv ]; then
load_env --file $pfxfat/grubenv load_env --file $pfxfat/grubenv
......
features.in/grub/cfg.in/20install2.cfg
View file @ c25d9ab9
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' { menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/25install-vnc-connect.cfg
View file @ c25d9ab9
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' { menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
savedefault savedefault
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/25install-vnc-listen.cfg
View file @ c25d9ab9
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' { menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
savedefault savedefault
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/30live.cfg
View file @ c25d9ab9
menuentry $"LiveCD (no hard disk needed)" --id 'live' { menuentry $"LiveCD (no hard disk needed)" --id 'live' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/32live_rw.cfg
View file @ c25d9ab9
menuentry $"LiveCD with sessions support" --id 'session' { menuentry $"LiveCD with sessions support" --id 'session' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/80rescue.cfg
View file @ c25d9ab9
menuentry $"Rescue LiveCD" --id 'rescue' { menuentry $"Rescue LiveCD" --id 'rescue' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/82rescue_rw.cfg
View file @ c25d9ab9
menuentry $"Rescue with sessions support" --id 'rescue_session' { menuentry $"Rescue with sessions support" --id 'rescue_session' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS live_rw linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS live_rw
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/83rescue_fm.cfg
View file @ c25d9ab9
menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' { menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/84rescue_remote.cfg
View file @ c25d9ab9
menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' { menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
savedefault savedefault
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/85mediacheck.cfg
View file @ c25d9ab9
menuentry $"Check this media for defects" --id 'mediachk' { menuentry $"Check this media for defects" --id 'mediachk' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash showopts @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash showopts @bootargs@ $EFI_BOOTARGS
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
features.in/grub/cfg.in/88netinstall.cfg
View file @ c25d9ab9
...@@ -2,79 +2,79 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' { ...@@ -2,79 +2,79 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install over network" { submenu $"Install over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
} }
submenu $"Live over network" { submenu $"Live over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
} }
submenu $"Rescue over network" { submenu $"Rescue over network" {
menuentry $"Server NFS" { menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server FTP" { menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp stagename=rescue @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp stagename=rescue @bootargs@ $EFI_BOOTARGS
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server HTTP" { menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http stagename=rescue @bootargs@ $EFI_BOOTARGS linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http stagename=rescue @bootargs@ $EFI_BOOTARGS
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
menuentry $"Server SAMBA" { menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment