diff --git a/features.in/syslinux/cfg.in/80rescue.cfg b/features.in/syslinux/cfg.in/80rescue.cfg index e8e446b7..db3ad6b7 100644 --- a/features.in/syslinux/cfg.in/80rescue.cfg +++ b/features.in/syslinux/cfg.in/80rescue.cfg @@ -1,5 +1,5 @@ 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@ diff --git a/features.in/syslinux/cfg.in/82rescue_rw.cfg b/features.in/syslinux/cfg.in/82rescue_rw.cfg index 41ded117..61c53607 100644 --- a/features.in/syslinux/cfg.in/82rescue_rw.cfg +++ b/features.in/syslinux/cfg.in/82rescue_rw.cfg @@ -1,5 +1,5 @@ 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@ diff --git a/features.in/syslinux/cfg.in/83rescue_fm.cfg b/features.in/syslinux/cfg.in/83rescue_fm.cfg index d3e14d4b..87791fd0 100644 --- a/features.in/syslinux/cfg.in/83rescue_fm.cfg +++ b/features.in/syslinux/cfg.in/83rescue_fm.cfg @@ -1,5 +1,5 @@ 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@ diff --git a/features.in/syslinux/cfg.in/84rescue_remote.cfg b/features.in/syslinux/cfg.in/84rescue_remote.cfg index 986ecca8..642f48da 100644 --- a/features.in/syslinux/cfg.in/84rescue_remote.cfg +++ b/features.in/syslinux/cfg.in/84rescue_remote.cfg @@ -1,5 +1,5 @@ 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@ diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk index 64139ff8..7d14db25 100644 --- 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 \