e2k: fix initrd-bootchain support

features.in/e2k/scripts.d/20-e2k-boot

@@ -53,13 +53,13 @@ for i in live altinst liveinst rescue; do
 label=$label
     partition=0
     image=/boot/image.0
-    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live automatic=method:cdrom ${stage2:+$stage2 }${init:+$init }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
+    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live ${GLOBAL_STAGE1_INITRD_TYPEARGS:-automatic}=method:cdrom ${stage2:+$stage2 }${init:+$init }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
     initrd=/boot/initrd.img
 
 label=${label}_flash
     partition=0
     image=/boot/image.0
-    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem automatic=method:disk,label:altinst,directory:/ ${stage2:+$stage2 }${init:+$init }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
+    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem ${GLOBAL_STAGE1_INITRD_TYPEARGS:-automatic}=method:disk,label:altinst ${stage2:+$stage2 }${init:+$init }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
     initrd=/boot/initrd.img
 EOF
 done

features.in/initrd-bootchain/config.mk

@@ -3,6 +3,7 @@ use/initrd-bootchain:
 	@$(call set,STAGE1_INITRD,initrd-bootchain)
 	@$(call set,STAGE1_PACKAGES,make-initrd-bootchain)
 	@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "root=bootchain bootchain=fg,altboot automatic"))
+	@$(call xport,STAGE1_INITRD_TYPEARGS)
 	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:disk,uuid:$(UUID_ISO)"))
 	@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)
 	@$(call try,BOOTCHAIN_BC_FGVT_ACTIVATE,7)

features.in/initrd-propagator/config.mk

@@ -3,5 +3,6 @@ use/initrd-propagator:
 	@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
 	@$(call set,STAGE1_INITRD,initrd-propagator)
 	@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "changedisk automatic"))
+	@$(call xport,STAGE1_INITRD_TYPEARGS)
 	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:cdrom,fuid:$(UUID_ISO)"))
 	@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)