diff options
| author | Jesse Hathaway <jesse@mbuki-mvuki.org> | 2007-10-31 14:39:05 -0400 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:28 +0100 |
| commit | 1652f585751bd32f850933980e98a409bec8da0c (patch) | |
| tree | 4e51a0fda708972f2c9753e944b8c170cf2e9a30 /templates | |
| parent | afe1aa871eed148737d07a5bd84340c2cc420fff (diff) | |
| download | live-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')
| -rw-r--r-- | templates/syslinux/menu/header.cfg | 2 | ||||
| -rw-r--r-- | templates/syslinux/menu/prompt.cfg | 2 | ||||
| -rw-r--r-- | templates/syslinux/normal/footer.cfg | 1 | ||||
| -rw-r--r-- | templates/syslinux/normal/prompt.cfg | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg index 56c5efd..bb3dac8 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 d5b1831..3ea1ab4 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 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 |