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.

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

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}"
 

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
 

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
 

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}

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

templates/syslinux/normal/footer.cfg

@@ -1 +0,0 @@
-timeout {$LINUX_TIMEOUT}

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