summaryrefslogtreecommitdiff
path: root/templates/syslinux/normal
diff options
context:
space:
mode:
authorJesse Hathaway <jesse@mbuki-mvuki.org>2007-10-31 14:39:05 -0400
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:28 +0100
commit1652f585751bd32f850933980e98a409bec8da0c (patch)
tree4e51a0fda708972f2c9753e944b8c170cf2e9a30 /templates/syslinux/normal
parentafe1aa871eed148737d07a5bd84340c2cc420fff (diff)
downloadlive-build-1652f585751bd32f850933980e98a409bec8da0c.zip
live-build-1652f585751bd32f850933980e98a409bec8da0c.tar.gz
fix syslinux timeout option
change MILISECONDS to SECONDS. Syslinux actually uses tenths of seconds not milliseconds, but it seems unnecessary to expose this to the user. Fix templates to only specify the timeout once.
Diffstat (limited to 'templates/syslinux/normal')
-rw-r--r--templates/syslinux/normal/footer.cfg1
-rw-r--r--templates/syslinux/normal/prompt.cfg2
2 files changed, 1 insertions, 2 deletions
diff --git a/templates/syslinux/normal/footer.cfg b/templates/syslinux/normal/footer.cfg
index 368c307..e69de29 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 97ed60c..0e82c43 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