Skip to content

M
mkimage-profiles
Commit 5dff1ae8 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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.
parent 8e4d9490
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
features.in/syslinux/config.mk
View file @ 5dff1ae8
...@@ -7,6 +7,7 @@ use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid) ...@@ -7,6 +7,7 @@ use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call try,BOOTVGA,normal) @$(call try,BOOTVGA,normal)
@$(call add,SYSLINUX_FILES,/usr/lib/syslinux/pxelinux.0) @$(call add,SYSLINUX_FILES,/usr/lib/syslinux/pxelinux.0)
@$(call try,META_SYSTEM_ID,SYSLINUX) @$(call try,META_SYSTEM_ID,SYSLINUX)
@$(call try,SYSLINUX_UI,none)
@$(call set,RELNAME,ALT ($(IMAGE_NAME))) @$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call xport,SYSLINUX_DEFAULT) @$(call xport,SYSLINUX_DEFAULT)
else else
......
features.in/syslinux/generate.mk
View file @ 5dff1ae8
...@@ -16,11 +16,8 @@ STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD) ...@@ -16,11 +16,8 @@ STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
# UI is backed by modules in modern syslinux # UI is backed by modules in modern syslinux
# (except for built-in text prompt) # (except for built-in text prompt)
ifneq (,$(SYSLINUX_UI)) ifneq (none,$(SYSLINUX_UI))
SYSLINUX_MODULES := $(SYSLINUX_MODULES) $(SYSLINUX_UI) SYSLINUX_MODULES := $(SYSLINUX_MODULES) $(SYSLINUX_UI)
else
$(warning no syslinux ui configured, default is now none)
SYSLINUX_UI := none
endif endif
ifeq (,$(SYSLINUX_DIRECT)) ifeq (,$(SYSLINUX_DIRECT))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment