grub, syslinux: do'nt use STAGE1_INITRD_BOOTARGS variable in generate.mk

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

 
 menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ @bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=altinst ramdisk_size=@altinst_size@ @bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/21live-install.cfg

@@ -2,7 +2,7 @@
 menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

@@ -2,7 +2,7 @@
 menuentry $"VNC install (edit to set server IP address)" --id 'vncconnect' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lovmem headless no_alt_virt_keyboard vncconnect=IP lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lovmem headless no_alt_virt_keyboard vncconnect=IP lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

@@ -2,7 +2,7 @@
 menuentry $"VNC install (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-connect.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install (edit to set server IP address)" --id 'vncconnect' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-listen.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"@LIVE_NAME@" --id 'live' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"LiveCD with sessions support" --id 'session' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw @bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live ramdisk_size=@live_size@ live_rw @bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/33live-rescue.cfg

 menuentry $"Rescue LiveCD" --id 'rescue' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash @rescue_bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash @rescue_bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/34live-rescue_rw.cfg

 menuentry $"Rescue LiveCD with sessions support" --id 'rescue_session' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ live_rw nosplash @rescue_bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ live_rw nosplash @rescue_bootargs@ lang=$lang lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"Rescue LiveCD" --id 'rescue' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"Rescue with sessions support" --id 'rescue_session' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ live_rw lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ live_rw lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 port=22 rootpw=AUTO hash=@rescue_hash@ lowmem console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 port=22 rootpw=AUTO hash=@rescue_hash@ lowmem console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"Check this media for defects" --id 'mediachk' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@  console=@serial_port@,@serial_speed@n8 console=tty0
+  linux /boot/vmlinuz$KFLAVOUR live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@  console=@serial_port@,@serial_speed@n8 console=tty0
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/generate.mk

@@ -12,8 +12,6 @@ ifeq (,$(BOOTLOADER))
 $(error grub feature enabled but BOOTLOADER undefined)
 endif
 
-STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
-
 ifeq (,$(GRUB_DIRECT))
 # SUBPROFILES are considered GRUB_CFG too
 # (note these can appear like stage2@live);
@@ -107,7 +105,6 @@ bootargs: clean
 	sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS)
 	@sed -i "s,@initrd@,initrd," $(DSTCFGS)
 	@sed -i "s,@initrd_ext@,img," $(DSTCFGS)
-	@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS)
 	@sed -i "s|@initrd_bootmethod@|$(STAGE1_INITRD_BOOTMETHOD)|g" $(DSTCFGS)
 	@sed -i "s|@initrd_typeargs@|$(STAGE1_INITRD_TYPEARGS)|g" $(DSTCFGS)
 	@sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)

features.in/syslinux/cfg.in/20install2.cfg

@@ -3,5 +3,5 @@ default linux
 label linux
   menu label ^Install @relname@
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@ lowmem
  

features.in/syslinux/cfg.in/21live-install.cfg

@@ -3,5 +3,5 @@ default linux
 label linux
   menu label ^Install @relname@
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts vga=@bootvga@ @bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts vga=@bootvga@ @bootargs@ lowmem
 

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

 label vncconnect
   menu label ^VNC install (edit to set server IP address)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncconnect=IP
+  append initrd=/boot/@initrd@ fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncconnect=IP
 

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

 label vncpasswd
   menu label VNC install (<Tab>, set pass^word and connect here)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD
+  append initrd=/boot/@initrd@ fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD
 

features.in/syslinux/cfg.in/26live-install-vnc-connect.cfg

 label vncconnect
   menu label ^VNC install (edit to set server IP address)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts nosplash lovmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
+  append initrd=/boot/@initrd@ fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts nosplash lovmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
 

features.in/syslinux/cfg.in/26live-install-vnc-listen.cfg

 label vncpasswd
   menu label VNC install (<Tab>, set pass^word and connect here)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
+  append initrd=/boot/@initrd@ fastboot @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
 

features.in/syslinux/cfg.in/30live.cfg

 label live
   menu label ^@LIVE_NAME@
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live ramdisk_size=@live_size@ showopts lowmem vga=@bootvga@ @bootargs@
 

features.in/syslinux/cfg.in/32live_rw.cfg

 label session
   menu label LiveCD with ^sessions support
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live ramdisk_size=@live_size@ showopts live_rw vga=@bootvga@ @bootargs@ lowmem
 

features.in/syslinux/cfg.in/33live-rescue.cfg

 label rescue
   menu label ^Rescue LiveCD
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash showopts vga=@bootvga@ @rescue_bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash showopts vga=@bootvga@ @rescue_bootargs@ lowmem
 

features.in/syslinux/cfg.in/34live-rescue_rw.cfg

 label rescue_session
   menu label ^Rescue LiveCD with sessions support
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ live_rw nosplash showopts vga=@bootvga@ @rescue_bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ live_rw nosplash showopts vga=@bootvga@ @rescue_bootargs@ lowmem
 

features.in/syslinux/cfg.in/80rescue.cfg

 label rescue
   menu label ^Rescue LiveCD
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ lowmem
 

features.in/syslinux/cfg.in/82rescue_rw.cfg

 label rescue_session
   menu label Rescue with sess^ions support
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ live_rw lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ live_rw lowmem
 

features.in/syslinux/cfg.in/83rescue_fm.cfg

 label rescue_forensic
   menu label ^Forensic mode (leave disks alone)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ lowmem
 

features.in/syslinux/cfg.in/84rescue_remote.cfg

 label rescue_remote
   menu label Rescue with remote SSH ^access (DHCP)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ port=22 rootpw=AUTO lowmem
+  append initrd=/boot/@initrd@ fastboot live @initrd_typeargs@=@initrd_bootmethod@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ port=22 rootpw=AUTO lowmem

features.in/syslinux/cfg.in/85mediacheck.cfg

 label mediachk
   menu label ^Check this media for defects
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ live @initrd_bootargs@ mediacheck=1 stagename=mediacheck nosplash showopts lowmem @bootargs@
+  append initrd=/boot/@initrd@ live @initrd_typeargs@=@initrd_bootmethod@ mediacheck=1 stagename=mediacheck nosplash showopts lowmem @bootargs@