syslinux: try SYSLINUX_UI to none

Instead of showing a warning, it is better to explicitly specify the SYSLINUX_UI=none option in the config.

syslinux: try SYSLINUX_UI to none
5dff1ae8 · Anton Midyukov · 8e4d9490 · 5dff1ae8 · 5dff1ae8
Commit 5dff1ae8 authored Jan 01, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

config.mk features.in/syslinux/config.mk +1 -0

generate.mk features.in/syslinux/generate.mk +1 -4

No files found.
--- a/features.in/syslinux/config.mk
+++ b/features.in/syslinux/config.mk
@@ -7,6 +7,7 @@ use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
 	@$(call try,BOOTVGA,normal)
 	@$(call add,SYSLINUX_FILES,/usr/lib/syslinux/pxelinux.0)
 	@$(call try,META_SYSTEM_ID,SYSLINUX)
+	@$(call try,SYSLINUX_UI,none)
 	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
 	@$(call xport,SYSLINUX_DEFAULT)
 else

--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -16,11 +16,8 @@ STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)

 # UI is backed by modules in modern syslinux
 # (except for built-in text prompt)
-ifneq (,$(SYSLINUX_UI))
+ifneq (none,$(SYSLINUX_UI))
 SYSLINUX_MODULES := $(SYSLINUX_MODULES) $(SYSLINUX_UI)
-else
-$(warning no syslinux ui configured, default is now none)
-SYSLINUX_UI := none
 endif

 ifeq (,$(SYSLINUX_DIRECT))