grub, syslinux: Add support initrd.img instead full.cz

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

@@ -5,5 +5,5 @@ menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux$linux_suffix /boot/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }
 

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

@@ -2,7 +2,7 @@ menuentry $"LiveCD (no hard disk needed)" --id 'live' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux$linux_suffix /boot/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }
 
 

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

@@ -2,5 +2,5 @@ menuentry $"LiveCD with sessions support" --id 'session' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux$linux_suffix /boot/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

@@ -2,5 +2,5 @@ menuentry $"Rescue LiveCD" --id 'rescue' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux$linux_suffix /boot/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

@@ -2,5 +2,5 @@ menuentry $"Rescue with sessions support" --id 'rescue_session' {
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux$linux_suffix /boot/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

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

 menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
   linux$linux_suffix /boot/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/full$KFLAVOUR.cz
+  initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/generate.mk

@@ -102,6 +102,14 @@ bootargs: clean
 	GRUBTHEME=$(GRUBTHEME); \
 	[ -n "$$GRUBTHEME" ] || GRUBTHEME=$$(cut -d "-" -f2 <<< $(BRANDING)); \
 	sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS)
+	@echo STAGE1_INITRD=$(STAGE1_INITRD)
+	@if [ "$(STAGE1_INITRD)" = PROPAGATOR ]; then \
+		sed -i "s,@initrd@,full," $(DSTCFGS); \
+		sed -i "s,@initrd_ext@,cz," $(DSTCFGS); \
+	else \
+		sed -i "s,@initrd@,initrd," $(DSTCFGS); \
+		sed -i "s,@initrd_ext@,img," $(DSTCFGS); \
+	fi
 
 clean: copy
 	@if [ "$(GRUB_UI)" = gfxboot ]; then \

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/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@
+  append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@
  

features.in/syslinux/cfg.in/20pid1.cfg

 label pid1
   menu label ^Just run as PID 1
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz @bootargs@
+  append initrd=/boot/@initrd@ @bootargs@

features.in/syslinux/cfg.in/21install2-failsafe.cfg

 label noapic
   menu label ^Failsafe install
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz changedisk ramdisk_size=@altinst_size@ showopts lowmem noapic nolapic xdriver=vesa @bootargs@
+  append initrd=/boot/@initrd@ changedisk ramdisk_size=@altinst_size@ showopts lowmem noapic nolapic xdriver=vesa @bootargs@
 

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

 label vncconnect
   menu label VNC client (edit to set server IP address)
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
+  append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
 

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

 label vncpasswd
   menu label Install @relname@ (headless with DHCP+VNC) (password VNCPWD)
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
+  append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
 

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/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
+  append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ 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/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
+  append initrd=/boot/@initrd@ changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
 

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

 label live
   menu label ^LiveCD (no hard disk needed)
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@
+  append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live 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/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@
+  append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@
 

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

 label rescue
   menu label ^Rescue LiveCD
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@
+  append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@
 

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

 label rescue_session
   menu label Rescue with sess^ions support
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
+  append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
 

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

 label rescue_forensic
   menu label ^Forensic mode (leave disks alone)
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
+  append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
 

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/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO
+  append initrd=/boot/@initrd@ fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO
 

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

 label mediachk
   menu label ^Check this media for defects
   kernel /boot/vmlinuz
-  append initrd=/boot/full.cz live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@
+  append initrd=/boot/@initrd@ live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@
 

features.in/syslinux/generate.mk

@@ -90,6 +90,11 @@ bootargs: clean
 		sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTCFGS); \
 	fi; \
 	sed -i "s,@bootvga@,,;s,vga= ,," $(DSTCFGS)
+	@if [ "$(STAGE1_INITRD)" = PROPAGATOR ]; then \
+		sed -i "s,@initrd@,full.cz," $(DSTCFGS); \
+	else \
+		sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \
+	fi
 
 clean: copy
 	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \