aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-02-02 09:27:21 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-02-02 09:27:55 +0200
commitb3ceff26580a82179fd4fd0e8f6853ac46dd783c (patch)
treef5add2df3b8565de6194bcc19df16e1d69aeb494
parent83c6267bbb490da1faffd4f359017481a094da37 (diff)
downloadalpine-iso-b3ceff26580a82179fd4fd0e8f6853ac46dd783c.tar.bz2
alpine-iso-b3ceff26580a82179fd4fd0e8f6853ac46dd783c.tar.xz
allow profile to override syslinux 'prompt' and 'timeout'
-rwxr-xr-xMakefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3e32de5..9fcf697 100755
--- a/Makefile
+++ b/Makefile
@@ -195,6 +195,7 @@ $(ISO_DIR)/xen.apkovl.tar.gz:
$(call rc_add,xenconsoled,default)
@cd $(APKOVL_DIR) && $(TAR) -zcf $@ *
@echo "==> apkovl: built $@"
+
#
# ISO rules
#
@@ -207,7 +208,8 @@ ISOLINUX_C32 := $(ISOLINUX)/ldlinux.c32 $(ISOLINUX)/libutil.c32 \
ISOLINUX_CFG := $(ISOLINUX)/isolinux.cfg
SYSLINUX_CFG := $(ISOLINUX)/syslinux.cfg
SYSLINUX_SERIAL ?=
-
+SYSLINUX_TIMEOUT ?= 20
+SYSLINUX_PROMPT ?= 1
$(ISOLINUX_C32):
@@ -233,8 +235,8 @@ $(ISOLINUX_CFG):
@echo "==> iso: configure isolinux"
@mkdir -p $(dir $(ISOLINUX_BIN))
@echo "$(SYSLINUX_SERIAL)" >$@
- @echo "timeout 20" >>$@
- @echo "prompt 1" >>$@
+ @echo "timeout $(SYSLINUX_TIMEOUT)" >>$@
+ @echo "prompt $(SYSLINUX_PROMPT)" >>$@
ifeq ($(PROFILE), alpine-xen)
@echo "default xen-$(KERNEL_FLAVOR_DEFAULT)" >>$@
@for flavor in $(KERNEL_FLAVOR); do \