grub,initrd-propagator,syslinux: split STAGE1_INITRD_BOOTARGS in half

features.in/grub/generate.mk

@@ -12,6 +12,8 @@ ifndef BOOTLOADER
 $(error grub feature enabled but BOOTLOADER undefined)
 endif
 
+STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
+
 ifndef GRUB_DIRECT
 # SUBPROFILES are considered GRUB_CFG too
 # (note these can appear like stage2@live);
@@ -112,6 +114,8 @@ bootargs: clean
 		sed -i "s,@initrd_ext@,img," $(DSTCFGS); \
 	fi
 	@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS)
+	@sed -i "s|@initrd_bootargs@|$(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)
 
 clean: copy

features.in/initrd-propagator/config.mk

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

features.in/syslinux/generate.mk

@@ -12,6 +12,8 @@ ifndef BOOTLOADER
 $(error syslinux feature enabled but BOOTLOADER undefined)
 endif
 
+STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
+
 # UI is backed by modules in modern syslinux
 # (except for built-in text prompt)
 ifdef SYSLINUX_UI
@@ -96,6 +98,8 @@ bootargs: clean
 		sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \
 	fi
 	@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS)
+	@sed -i "s|@initrd_bootargs@|$(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)
 
 clean: copy