syslinux: added RESCUE_BOOTARGS support

This one is just like STAGE2_BOOTARGS but for rescue images (which don't do that one for quite a few reasons).

syslinux: added RESCUE_BOOTARGS support
79d02088 · Michael Shigorin · ae088e3b · 79d02088 · 79d02088 · 79d02088
Commit 79d02088 authored Apr 04, 2016 by Michael Shigorin
5 changed files
--- a/features.in/syslinux/cfg.in/80rescue.cfg
+++ b/features.in/syslinux/cfg.in/80rescue.cfg
 label rescue
  menu label ^Rescue LiveCD
  kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue
+  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@

--- a/features.in/syslinux/cfg.in/82rescue_rw.cfg
+++ b/features.in/syslinux/cfg.in/82rescue_rw.cfg
 label rescue_session
  menu label Rescue with sess^ions support
  kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue live_rw
+  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue live_rw @rescue_bootargs@

--- a/features.in/syslinux/cfg.in/83rescue_fm.cfg
+++ b/features.in/syslinux/cfg.in/83rescue_fm.cfg
 label rescue_forensic
  menu label ^Forensic mode (leave disks alone)
  kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue max_loop=16 forensic hash=@rescue_hash@
+  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue max_loop=16 forensic hash=@rescue_hash@ @rescue_bootargs@

--- a/features.in/syslinux/cfg.in/84rescue_remote.cfg
+++ b/features.in/syslinux/cfg.in/84rescue_remote.cfg
 label rescue_remote
  menu label Rescue with remote SSH ^access (DHCP)
  kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue quiet ip=dhcp port=22 rootpw=AUTO
+  append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue quiet ip=dhcp port=22 rootpw=AUTO @rescue_bootargs@

--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -81,6 +81,10 @@ bootargs: clean
 		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTDIR)/*.cfg; \
 	fi; \
 	sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
+	@if [ -n "$(RESCUE_BOOTARGS)" ]; then \
+		sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \
+	fi; \
+	sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg

 clean: copy
 	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \