From 3e77e0295670c1287e447e32695099b69429f7aa Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Wed, 12 May 2021 13:36:59 +0700 Subject: [PATCH] grub, initrd-propagator, stage2, syslinux: set STAGE1_INITRD_BOOTARGS in initrd-propagator --- features.in/grub/generate.mk | 5 ----- features.in/initrd-propagator/config.mk | 4 +++- features.in/stage2/config.mk | 2 +- features.in/syslinux/generate.mk | 5 ----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/features.in/grub/generate.mk b/features.in/grub/generate.mk index 12fde8f5..56ffc48b 100644 --- a/features.in/grub/generate.mk +++ b/features.in/grub/generate.mk @@ -33,11 +33,6 @@ GRUB_CFG := $(GRUB_CFG) kernel 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 DSTCFGS := $(DSTDIR)/*.cfg diff --git a/features.in/initrd-propagator/config.mk b/features.in/initrd-propagator/config.mk index eb86282b..f023c44d 100644 --- a/features.in/initrd-propagator/config.mk +++ b/features.in/initrd-propagator/config.mk @@ -1,4 +1,6 @@ -use/initrd-propagator: +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_STAGE2_OPTION,stagename) diff --git a/features.in/stage2/config.mk b/features.in/stage2/config.mk index 91f7daf9..c26855b9 100644 --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -1,5 +1,5 @@ # "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,STAGE1_PACKAGES,make-initrd file iproute2) @$(call add,STAGE1_MODLISTS,$$(FEATURES)) diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk index 27742471..ef53a73c 100644 --- a/features.in/syslinux/generate.mk +++ b/features.in/syslinux/generate.mk @@ -31,11 +31,6 @@ endif DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in 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} # CFG have only cfg snippet # FILES have only filenames (absolute or relative to /usr/lib/syslinux/)