summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhelpers/lh_binary_syslinux2
-rwxr-xr-xhelpers/lh_config4
-rw-r--r--manpages/lh_config.de.12
-rw-r--r--manpages/lh_config.en.12
-rw-r--r--templates/syslinux/menu/header.cfg2
-rw-r--r--templates/syslinux/menu/prompt.cfg2
-rw-r--r--templates/syslinux/normal/footer.cfg1
-rw-r--r--templates/syslinux/normal/prompt.cfg2
8 files changed, 8 insertions, 9 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 7de257cee..5e87d752c 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -254,7 +254,7 @@ Configure_syslinux_templates ()
-e "s/{\$LH_DATE}/$(date +%Y%m%d)/" \
-e "s/{\$LH_MEDIA}/${MEDIA}/" \
-e "s/{\$LH_VERSION}/${VERSION}/" \
- -e "s/{\$LINUX_TIMEOUT}/${LH_SYSLINUX_TIMEOUT}/" \
+ -e "s/{\$LH_SYSLINUX_TIMEOUT}/${LH_SYSLINUX_TIMEOUT}0/" \
-e 's/\ $//g' \
$template_file
done
diff --git a/helpers/lh_config b/helpers/lh_config
index 741b44292..808c9cc9b 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -94,7 +94,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [-s|--source-images iso|net|tar|usb-hdd]\n\
\t [--symlinks enabled|disabled]\n\
\t [--syslinux-splash FILE]\n\
-\t [--syslinux-timeout MILISECONDS]\n\
+\t [--syslinux-timeout SECONDS]\n\
\t [--sysvinit enabled|disabled]\n\
\t [--tasksel aptitude|tasksel]\n\
\t [--tasks TASK]\n\
@@ -971,7 +971,7 @@ LH_NET_COW_SERVER="${LH_NET_COW_SERVER}"
# (Default: empty)
LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
-# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
+# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
# (Default: 0)
LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT}"
diff --git a/manpages/lh_config.de.1 b/manpages/lh_config.de.1
index ad521f628..4b20d120d 100644
--- a/manpages/lh_config.de.1
+++ b/manpages/lh_config.de.1
@@ -139,7 +139,7 @@ Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Optionen f\[:u]r lh_c
.IP "\fB\-\-syslinux\-splash\fR \fIFILE\fR" 4
-.IP "\fB\-\-syslinux\-timeout\fR \fIMILISECONDS\fR" 4
+.IP "\fB\-\-syslinux\-timeout\fR \fISECONDS\fR" 4
.IP "\fB\-\-sysvinit\fR enabled|disabled" 4
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 570ff22a6..46aec1e90 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -158,7 +158,7 @@ EXAMPLE:
.IP "\fB\-\-syslinux\-splash\fR \fIFILE\fR" 4
-.IP "\fB\-\-syslinux\-timeout\fR \fIMILISECONDS\fR" 4
+.IP "\fB\-\-syslinux\-timeout\fR \fISECONDS\fR" 4
.IP "\fB\-\-sysvinit\fR enabled|disabled" 4
diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg
index 56c5efd89..bb3dac8a0 100644
--- a/templates/syslinux/menu/header.cfg
+++ b/templates/syslinux/menu/header.cfg
@@ -1,7 +1,7 @@
default {$LIVE_DATA_PATH}/vesamenu.c32
font {$LIVE_DATA_PATH}/iso01.f14.psf
-timeout 1000
+timeout {$LH_SYSLINUX_TIMEOUT}
prompt 0
menu background {$SPLASH}
diff --git a/templates/syslinux/menu/prompt.cfg b/templates/syslinux/menu/prompt.cfg
index d5b183137..3ea1ab4d9 100644
--- a/templates/syslinux/menu/prompt.cfg
+++ b/templates/syslinux/menu/prompt.cfg
@@ -1,5 +1,5 @@
prompt 1
-timeout 0
+timeout {$LH_SYSLINUX_TIMEOUT}
default live
display {$LIVE_SCREEN_PATH}/f1.txt
include {$LIVE_SCREEN_PATH}/menu.cfg
diff --git a/templates/syslinux/normal/footer.cfg b/templates/syslinux/normal/footer.cfg
index 368c3071a..e69de29bb 100644
--- a/templates/syslinux/normal/footer.cfg
+++ b/templates/syslinux/normal/footer.cfg
@@ -1 +0,0 @@
-timeout {$LINUX_TIMEOUT}
diff --git a/templates/syslinux/normal/prompt.cfg b/templates/syslinux/normal/prompt.cfg
index 97ed60c95..0e82c437d 100644
--- a/templates/syslinux/normal/prompt.cfg
+++ b/templates/syslinux/normal/prompt.cfg
@@ -1,5 +1,5 @@
prompt 1
-timeout 0
+timeout {$LH_SYSLINUX_TIMEOUT}
default live
display {$LIVE_SCREEN_PATH}/boot.txt
include {$LIVE_SCREEN_PATH}/menu.cfg