From a61162c42b612cb0ce593952db479b6323612257 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Mon, 29 Mar 2021 13:28:43 +0700 Subject: [PATCH] grub, initrd-propagator, syslinux: Set STAGE1_INITRD to initrd-propagator --- features.in/grub/generate.mk | 3 +-- features.in/initrd-propagator/config.mk | 2 +- features.in/syslinux/generate.mk | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/features.in/grub/generate.mk b/features.in/grub/generate.mk index 8d4ba52b..f8a59f96 100644 --- a/features.in/grub/generate.mk +++ b/features.in/grub/generate.mk @@ -102,8 +102,7 @@ bootargs: clean GRUBTHEME=$(GRUBTHEME); \ [ -n "$$GRUBTHEME" ] || GRUBTHEME=$$(cut -d "-" -f2 <<< $(BRANDING)); \ sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS) - @echo STAGE1_INITRD=$(STAGE1_INITRD) - @if [ "$(STAGE1_INITRD)" = PROPAGATOR ]; then \ + @if [ "$(STAGE1_INITRD)" = initrd-propagator ]; then \ sed -i "s,@initrd@,full," $(DSTCFGS); \ sed -i "s,@initrd_ext@,cz," $(DSTCFGS); \ else \ diff --git a/features.in/initrd-propagator/config.mk b/features.in/initrd-propagator/config.mk index a9e62e0f..eb86282b 100644 --- a/features.in/initrd-propagator/config.mk +++ b/features.in/initrd-propagator/config.mk @@ -1,4 +1,4 @@ use/initrd-propagator: @$(call add_feature) @$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator) - @$(call set,STAGE1_INITRD,PROPAGATOR) + @$(call set,STAGE1_INITRD,initrd-propagator) diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk index 252579f5..3ad807ea 100644 --- a/features.in/syslinux/generate.mk +++ b/features.in/syslinux/generate.mk @@ -90,7 +90,7 @@ bootargs: clean sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTCFGS); \ fi; \ sed -i "s,@bootvga@,,;s,vga= ,," $(DSTCFGS) - @if [ "$(STAGE1_INITRD)" = PROPAGATOR ]; then \ + @if [ "$(STAGE1_INITRD)" = initrd-propagator ]; then \ sed -i "s,@initrd@,full.cz," $(DSTCFGS); \ else \ sed -i "s,@initrd@,initrd.img," $(DSTCFGS); \