e2k: use RESCUE_BOOTARGS for rescue instead of STAGE2_BOOTARGS

A different set of boot arguments should be used for Rescue. But this was not done in e2k before, because on the one hand it was easier in the case of the generator, and on the other hand there was no need for it as plymouth was disabled there. The need arose after enabling plymouth on e2k and combining altinst, live and rescue functionality in one squashfs. We need to turn off plymouth for rescue images with 'nosplash' boot argument.

e2k: use RESCUE_BOOTARGS for rescue instead of STAGE2_BOOTARGS
2e7008df · Anton Midyukov · 74d98e1a · 2e7008df
Commit 2e7008df authored Apr 10, 2025 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

generate.mk features.in/e2k/generate.mk +6 -1

No files found.
--- a/features.in/e2k/generate.mk
+++ b/features.in/e2k/generate.mk
@@ -55,7 +55,12 @@ config: prep
 		sed -e "s,@stage2@,$$STAGE2$$INIT," \
 		    -e "s,@label@,$$LABEL," \
 			< $(DSTDIR)/body.conf \
-			>> $(RESULTCFG); \
+			> $(DSTDIR)/temp.conf; \
+		if [ "$$i" = rescue ] || [ "$$i" = liverescue ]; then \
+			sed -i "s;@stage2_bootargs@;nosplash $(RESCUE_BOOTARGS);" $(DSTDIR)/temp.conf; \
+		fi; \
+		cat $(DSTDIR)/temp.conf >> $(RESULTCFG); \
+		rm $(DSTDIR)/temp.conf; \
 	done; \
 	sed -i "s,@default@,$$DEFAULT," $(RESULTCFG); \
 	sed -i "s,@lang@,lang=$(LOCALE)," $(RESULTCFG); \