summaryrefslogtreecommitdiff
path: root/helpers
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 /helpers
parentafe1aa871eed148737d07a5bd84340c2cc420fff (diff)
downloadvyos-live-build-1652f585751bd32f850933980e98a409bec8da0c.tar.gz
vyos-live-build-1652f585751bd32f850933980e98a409bec8da0c.zip
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 'helpers')
-rwxr-xr-xhelpers/lh_binary_syslinux2
-rwxr-xr-xhelpers/lh_config4
2 files changed, 3 insertions, 3 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}"