grub: Use variable $linux_suffix

features.in/grub/cfg.in/00defaults.cfg

@@ -4,4 +4,8 @@ insmod minicmd
 insmod normal
 insmod test
 set timeout=@timeout@
+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

features.in/grub/cfg.in/20install2.cfg

@@ -3,7 +3,7 @@ default='linux'
 
 menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }

features.in/grub/cfg.in/25install-vnc-connect.cfg

 
 menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ @efi_bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ @efi_bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }

features.in/grub/cfg.in/25install-vnc-listen.cfg

 
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@  @efi_bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@  @efi_bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }
 

features.in/grub/cfg.in/30live.cfg

 menuentry $"LiveCD (no hard disk needed)" --id 'live' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }
 
 

features.in/grub/cfg.in/32live_rw.cfg

 menuentry $"LiveCD with sessions support" --id 'session' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@  @efi_bootargs@ lang=$lang
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@  @efi_bootargs@ lang=$lang
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }

features.in/grub/cfg.in/80rescue.cfg

 menuentry $"Rescue LiveCD" --id 'rescue' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ @efi_bootargs@
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ @efi_bootargs@
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }

features.in/grub/cfg.in/82rescue_rw.cfg

 menuentry $"Rescue with sessions support" --id 'rescue_session' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ @efi_bootargs@ live_rw
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ @efi_bootargs@ live_rw
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }

features.in/grub/cfg.in/83rescue_fm.cfg

 menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux@linux_suffix@ @boot_path@/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ @efi_bootargs@ max_loop=16 forensic hash=@rescue_hash@
+  linux$linux_suffix @boot_path@/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ @efi_bootargs@ max_loop=16 forensic hash=@rescue_hash@
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full.cz
+  initrd$linux_suffix @boot_path@/full.cz
 }

features.in/grub/cfg.in/84rescue_remote.cfg

 menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
-  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ @efi_bootargs@ max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@
+  linux$linux_suffix @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ @efi_bootargs@ max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@
   echo $"Loading initial ramdisk ..."
-  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+  initrd$linux_suffix @boot_path@/full$KFLAVOUR.cz
 }

features.in/grub/cfg.in/85mediacheck.cfg

 menuentry $"Check this media for defects" --id 'mediachk' {
-  linux@linux_suffix@ @boot_path@/vmlinuz changedisk live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@ @efi_bootargs@
-  initrd@linux_suffix@ @boot_path@/full.cz
+  linux$linux_suffix @boot_path@/vmlinuz changedisk live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@ @efi_bootargs@
+  initrd$linux_suffix @boot_path@/full.cz
 }

features.in/grub/stage1/scripts.d/01-grub

@@ -83,18 +83,6 @@ if [ -f "$CFG_EFI" ]; then
 	sed -i "s, @efi_bootargs@,,g" "$CFG_EFI"
 fi
 
-# change @linux_suffix@
-case "$GLOBAL_ARCH" in
-	i586|x86_64)
-		[ ! -f "$CFG" ] || sed -i 's/@linux_suffix@/16/g' "$CFG"
-		[ ! -f "$CFG_EFI" ] || sed -i 's/@linux_suffix@/efi/g' "$CFG_EFI"
-	;;
-	*)
-		[ ! -f "$CFG" ] || sed -i 's/@linux_suffix@//g' "$CFG"
-		[ ! -f "$CFG_EFI" ] || sed -i 's/@linux_suffix@//g' "$CFG_EFI"
-	;;
-esac
-
 # snippets are not going into the actual image
 if [ "$DEBUG" != 2 ]; then
 	rm -r .in/