Skip to content

M
mkimage-profiles
Commit 4b3bc4e0 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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

For use them separately.
parent 676aac35
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
features.in/grub/generate.mk
View file @ 4b3bc4e0
...@@ -12,6 +12,8 @@ ifndef BOOTLOADER ...@@ -12,6 +12,8 @@ ifndef BOOTLOADER
$(error grub feature enabled but BOOTLOADER undefined) $(error grub feature enabled but BOOTLOADER undefined)
endif endif
STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
ifndef GRUB_DIRECT ifndef GRUB_DIRECT
# SUBPROFILES are considered GRUB_CFG too # SUBPROFILES are considered GRUB_CFG too
# (note these can appear like stage2@live); # (note these can appear like stage2@live);
...@@ -112,6 +114,8 @@ bootargs: clean ...@@ -112,6 +114,8 @@ bootargs: clean
sed -i "s,@initrd_ext@,img," $(DSTCFGS); \ sed -i "s,@initrd_ext@,img," $(DSTCFGS); \
fi fi
@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS) @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) @sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
clean: copy clean: copy
......
features.in/initrd-propagator/config.mk
View file @ 4b3bc4e0
...@@ -2,5 +2,6 @@ use/initrd-propagator: use/uuid-iso ...@@ -2,5 +2,6 @@ use/initrd-propagator: use/uuid-iso
@$(call add_feature) @$(call add_feature)
@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator) @$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
@$(call set,STAGE1_INITRD,initrd-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) @$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)
features.in/syslinux/generate.mk
View file @ 4b3bc4e0
...@@ -12,6 +12,8 @@ ifndef BOOTLOADER ...@@ -12,6 +12,8 @@ ifndef BOOTLOADER
$(error syslinux feature enabled but BOOTLOADER undefined) $(error syslinux feature enabled but BOOTLOADER undefined)
endif endif
STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
# UI is backed by modules in modern syslinux # UI is backed by modules in modern syslinux
# (except for built-in text prompt) # (except for built-in text prompt)
ifdef SYSLINUX_UI ifdef SYSLINUX_UI
...@@ -96,6 +98,8 @@ bootargs: clean ...@@ -96,6 +98,8 @@ bootargs: clean
sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \ sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \
fi fi
@sed -i "s|@initrd_bootargs@|$(STAGE1_INITRD_BOOTARGS)|g" $(DSTCFGS) @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) @sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
clean: copy clean: copy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment