keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

grub, initrd-propagator, stage2, syslinux: set STAGE1_INITRD_BOOTARGS in initrd-propagator

Browse Source
This commit is contained in:
Anton Midyukov 2021-05-12 13:36:59 +07:00
parent e00c4243d8
commit 3e77e02956
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features.in/grub/generate.mk
View File

@ -33,11 +33,6 @@ GRUB_CFG := $(GRUB_CFG) kernel
endif endif
endif endif
ifeq (initrd-propagator,$(STAGE1_INITRD))
STAGE1_INITRD_BOOTARGS := changedisk automatic=method:cdrom
STAGE1_INITRD_STAGE2_OPTION := stagename
endif
DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in
DSTCFGS := $(DSTDIR)/*.cfg DSTCFGS := $(DSTDIR)/*.cfg

4
features.in/initrd-propagator/config.mk
View File

@ -1,4 +1,6 @@
use/initrd-propagator: 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_STAGE2_OPTION,stagename)

2
features.in/stage2/config.mk
View File

@ -1,5 +1,5 @@
# "1" is not a typo # "1" is not a typo
use/stage2: sub/stage1 use/initrd-propagator use/uuid-iso use/stage2: sub/stage1 use/initrd-propagator
@$(call add_feature) @$(call add_feature)
@$(call add,STAGE1_PACKAGES,make-initrd file iproute2) @$(call add,STAGE1_PACKAGES,make-initrd file iproute2)
@$(call add,STAGE1_MODLISTS,$$(FEATURES)) @$(call add,STAGE1_MODLISTS,$$(FEATURES))

5
features.in/syslinux/generate.mk
View File

@ -31,11 +31,6 @@ endif
DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in
DSTCFGS := $(DSTDIR)/*.cfg DSTCFGS := $(DSTDIR)/*.cfg
ifeq (initrd-propagator,$(STAGE1_INITRD))
STAGE1_INITRD_BOOTARGS := changedisk automatic=method:cdrom
STAGE1_INITRD_STAGE2_OPTION := stagename
endif
# we can do SYSLINUX_{CFG,MODULES,FILES} # we can do SYSLINUX_{CFG,MODULES,FILES}
# CFG have only cfg snippet # CFG have only cfg snippet
# FILES have only filenames (absolute or relative to /usr/lib/syslinux/) # FILES have only filenames (absolute or relative to /usr/lib/syslinux/)