Updating syslinux menu configuration.

17 files changed, 91 insertions, 356 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c01e7ba9d..4fb6e7655 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -750,11 +750,28 @@ Set_defaults ()
 	LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}"
 
 	# Setting syslinux menu
-	LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}"
+	case "${LH_DISTRIBUTION}" in
+		etch)
+			LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}"
+			;;
+
+		*)
+			LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-enabled}"
+			;;
+	esac
 
 	# Setting syslinux menu live entries
-	LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}"
-	LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} - Fail Safe}"
+	case "${LH_MODE}" in
+		debian|debian-release)
+			LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Live}"
+			LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
+			;;
+
+		*)
+			LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}"
+			LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
+			;;
+	esac
 
 	# Settings memtest menu entry
 	LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY:-Memory test}"
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 1aa12a4ed..f5dea99b2 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -72,10 +72,10 @@ Syslinux_memtest_entry ()
 	MENULABEL="$(Utf8_to_latin1 "${2}")"
 	KERNEL="${3}"
 
-	MEMTEST="${MEMTEST}\nLABEL ${LABEL}\n"
+	MEMTEST="${MEMTEST}\nlabel ${LABEL}\n"
 
 	# Write the menu label if the syslinux menu is being use
-	MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n"
+	MEMTEST="${MEMTEST}\tmenu label ${MENULABEL}\n"
 	MEMTEST="${MEMTEST}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
 	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
 }
@@ -104,18 +104,18 @@ Syslinux_live_entry ()
 	esac
 
 	# Regular kernel
-	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}\n"
 
 	# Write the menu label if the syslinux menu is being use
-	LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
 
 	# Failsafe kernel
-	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}failsafe\n"
+	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"
 
 	# Write the menu label if the syslinux menu is being use
-	LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL} (fail-safe mode)\n"
+	LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL} (failsafe)\n"
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
 }
@@ -162,8 +162,8 @@ Syslinux_install_entry ()
 				;;
 		esac
 
-		LINUX_INSTALL="${LINUX_INSTALL}\nLABEL $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tMENU LABEL Start ${LABEL} ${TYPE}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\nlabel $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tmenu label ${LABEL} ${TYPE}\n"
 		LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
 		LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"
 	done
@@ -175,14 +175,12 @@ Copy_syslinux_templates ()
 
 	if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
 	then
-		cp "${TEMPLATES}"/normal/*.cfg ${SCREEN_PATH}
-		cp "${TEMPLATES}"/normal/data/* ${DATA_PATH}
+		cp "${TEMPLATES}"/normal/* ${SCREEN_PATH}
 	else
-		cp "${TEMPLATES}"/menu/*.cfg ${SCREEN_PATH}
-		cp "${TEMPLATES}"/menu/data/* ${DATA_PATH}
+		cp "${TEMPLATES}"/menu/* ${SCREEN_PATH}
 
 		# Grab menu binary
-		MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+		MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
 		case "${LH_CHROOT_BUILD}" in
 			enabled)
 				cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
@@ -228,6 +226,11 @@ Copy_syslinux_templates ()
 		rm -f ${SCREEN_PATH}/*.install*
 	fi
 
+	if [ "${LH_SYSLINUX_MENU}" = "enabled" ]
+	then
+		rm -f ${DATA_PATH}/boot.txt
+	fi
+
 	# Copying custom splash screen
 	if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
 	then
@@ -332,11 +335,11 @@ case "${LH_BINARY_IMAGES}" in
 		SYSLINUX_PATH="binary/isolinux"
 		KERNEL_PATH="binary/${INITFS}"
 		SCREEN_PATH="${SYSLINUX_PATH}"
-		DATA_PATH="${SCREEN_PATH}/data"
+		DATA_PATH="${SCREEN_PATH}"
 		LIVE_KERNEL_PATH="/${INITFS}"
 		LIVE_INSTALL_KERNEL_PATH="/install"
 		LIVE_SCREEN_PATH="/isolinux"
-		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
 		MEDIA="CD-ROM"
 		;;
 
@@ -344,11 +347,11 @@ case "${LH_BINARY_IMAGES}" in
 		SYSLINUX_PATH="tftpboot"
 		KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}"
 		SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens"
-		DATA_PATH="${SCREEN_PATH}/data"
+		DATA_PATH="${SCREEN_PATH}"
 		LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}"
 		LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}"
 		LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens"
-		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
 		MEDIA="netboot"
 		;;
 
@@ -356,11 +359,11 @@ case "${LH_BINARY_IMAGES}" in
 		SYSLINUX_PATH="binary/syslinux"
 		KERNEL_PATH="binary/${INITFS}"
 		SCREEN_PATH="${SYSLINUX_PATH}"
-		DATA_PATH="${SCREEN_PATH}/data"
+		DATA_PATH="${SCREEN_PATH}"
 		LIVE_KERNEL_PATH="/${INITFS}"
 		LIVE_INSTALL_KERNEL_PATH="/install"
 		LIVE_SCREEN_PATH="/syslinux"
-		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
 
 		# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
 		# when using FAT hard drive images
diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/live.cfg
index b5a6e5c74..b5a6e5c74 100644
--- a/templates/syslinux/common/menu.cfg
+++ b/templates/syslinux/common/live.cfg
diff --git a/templates/syslinux/menu/data/iso01.f14.psf b/templates/syslinux/menu/data/iso01.f14.psf
deleted file mode 100644
index 0cc056af6..000000000
--- a/templates/syslinux/menu/data/iso01.f14.psf
+++ /dev/null
diff --git a/templates/syslinux/menu/data/splash.png b/templates/syslinux/menu/data/splash.png
deleted file mode 100644
index c2a83124e..000000000
--- a/templates/syslinux/menu/data/splash.png
+++ /dev/null
diff --git a/templates/syslinux/menu/data/splash.svg b/templates/syslinux/menu/data/splash.svg
deleted file mode 100644
index 44c5ac1a3..000000000
--- a/templates/syslinux/menu/data/splash.svg
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="640"
-   height="480"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docbase="/home/jesseh/images"
-   sodipodi:docname="debian_live_splash.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jesseh/images/debian_live_splash.png"
-   inkscape:export-xdpi="51.328423"
-   inkscape:export-ydpi="51.328423">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.5833333"
-     inkscape:cx="320.23153"
-     inkscape:cy="289.70887"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="640px"
-     height="480px"
-     inkscape:showpageshadow="false"
-     showborder="true"
-     inkscape:window-width="1258"
-     inkscape:window-height="970"
-     inkscape:window-x="9"
-     inkscape:window-y="10" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient8171">
-      <stop
-         style="stop-color:#ff1d00;stop-opacity:1;"
-         offset="0"
-         id="stop8173" />
-      <stop
-         id="stop8181"
-         offset="1"
-         style="stop-color:#ff001a;stop-opacity:0.72156864;" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Background"
-     style="display:inline">
-    <rect
-       style="opacity:1;fill:#fc1818;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect7200"
-       width="640.46307"
-       height="480"
-       x="-2.4400813e-06"
-       y="8.1152024e-07"
-       inkscape:export-xdpi="51.328423"
-       inkscape:export-ydpi="51.328423" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot8183"
-       style="font-size:90px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#4c0000;font-family:LaudatioC"
-       transform="translate(55.185917,15.402847)"><flowRegion
-         id="flowRegion8185"><rect
-           id="rect8187"
-           width="500.8558"
-           height="104.76898"
-           x="30.5644"
-           y="17.366137"
-           style="font-size:90px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#4c0000;font-family:LaudatioC" /></flowRegion><flowPara
-         id="flowPara8189"
-         style="font-size:90px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#4c0000;font-family:LaudatioC">Debian Live</flowPara></flowRoot>    <g
-       id="g13289"
-       style="fill:#fc1818"
-       transform="matrix(1.4256071,0,0,2.2229309,-135.58268,-152.00014)">
-      <rect
-         transform="matrix(0.9715002,-0.2370389,0.2370389,0.9715002,0,0)"
-         y="183.23943"
-         x="378.11713"
-         height="11.114327"
-         width="11.808972"
-         id="rect9401"
-         style="fill:#fc1818;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         transform="matrix(0.9715002,-0.2370389,0.2370389,0.9715002,0,0)"
-         y="149.98662"
-         x="240.36581"
-         height="11.114327"
-         width="11.808972"
-         id="rect11341"
-         style="fill:#fc1818;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       i:rgbTrio="#4F008000FFFF"
-       i:dimmedPercent="50"
-       i:layer="yes"
-       id="g13293"
-       transform="matrix(0.3940442,0,0,0.3454906,243.07731,23.897523)"
-       style="fill:#fcfcfc;display:inline">
-		<g
-   id="g13295"
-   style="fill:#fcfcfc">
-			<path
-   id="path13297"
-   d="M 51.986,57.297 C 50.189,57.322 52.326,58.223 54.672,58.584 C 55.32,58.078 55.908,57.566 56.432,57.068 C 54.971,57.426 53.484,57.434 51.986,57.297"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13299"
-   d="M 61.631,54.893 C 62.701,53.416 63.481,51.799 63.756,50.127 C 63.516,51.319 62.869,52.348 62.26,53.434 C 58.901,55.549 61.944,52.178 62.258,50.897 C 58.646,55.443 61.762,53.623 61.631,54.893"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13301"
-   d="M 65.191,45.629 C 65.408,42.393 64.554,43.416 64.267,44.651 C 64.602,44.825 64.867,46.932 65.191,45.629"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13303"
-   d="M 45.172,1.399 C 46.131,1.571 47.244,1.703 47.088,1.932 C 48.137,1.702 48.375,1.49 45.172,1.399"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13305"
-   d="M 47.088,1.932 L 46.41,2.072 L 47.041,2.016 L 47.088,1.932"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13307"
-   d="M 76.992,46.856 C 77.099,49.762 76.142,51.172 75.279,53.668 L 73.726,54.444 C 72.455,56.912 73.849,56.011 72.939,57.974 C 70.955,59.738 66.918,63.494 65.626,63.837 C 64.683,63.816 66.265,62.724 66.472,62.296 C 63.816,64.12 64.341,65.034 60.279,66.142 L 60.16,65.878 C 50.142,70.591 36.226,61.251 36.409,48.507 C 36.302,49.316 36.105,49.114 35.883,49.441 C 35.366,42.884 38.911,36.298 44.89,33.609 C 50.738,30.714 57.594,31.902 61.783,35.806 C 59.482,32.792 54.902,29.597 49.474,29.896 C 44.157,29.98 39.183,33.359 37.523,37.027 C 34.799,38.742 34.483,43.638 33.296,44.534 C 31.699,56.271 36.3,61.342 44.083,67.307 C 45.308,68.133 44.428,68.258 44.594,68.887 C 42.008,67.676 39.64,65.848 37.693,63.61 C 38.726,65.122 39.841,66.592 41.282,67.747 C 38.844,66.921 35.587,61.839 34.636,61.632 C 38.839,69.157 51.688,74.829 58.416,72.015 C 55.303,72.13 51.348,72.079 47.85,70.786 C 46.381,70.03 44.383,68.464 44.74,68.171 C 53.922,71.601 63.407,70.769 71.352,64.4 C 73.373,62.826 75.581,60.148 76.219,60.111 C 75.258,61.556 76.383,60.806 75.645,62.082 C 77.659,58.834 74.77,60.76 77.727,56.473 L 78.819,57.977 C 78.413,55.281 82.167,52.007 81.786,47.743 C 82.647,46.439 82.747,49.146 81.833,52.146 C 83.101,48.818 82.167,48.283 82.493,45.537 C 82.845,46.46 83.307,47.441 83.544,48.415 C 82.718,45.199 84.392,42.999 84.806,41.13 C 84.398,40.949 83.531,42.552 83.333,38.753 C 83.362,37.103 83.792,37.888 83.958,37.482 C 83.634,37.296 82.784,36.031 82.267,33.605 C 82.642,33.035 83.269,35.083 83.779,35.167 C 83.451,33.238 82.886,31.767 82.863,30.287 C 81.373,27.173 82.336,30.702 81.127,28.95 C 79.541,24.003 82.443,27.802 82.639,25.554 C 85.043,29.037 86.414,34.435 87.043,36.671 C 86.563,33.945 85.787,31.304 84.84,28.749 C 85.57,29.056 83.664,23.14 85.789,27.058 C 83.519,18.706 76.074,10.902 69.225,7.24 C 70.063,8.007 71.121,8.97 70.741,9.121 C 67.335,7.093 67.934,6.935 67.446,6.078 C 64.671,4.949 64.489,6.169 62.651,6.08 C 57.421,3.306 56.413,3.601 51.6,1.863 L 51.819,2.886 C 48.354,1.732 47.782,3.324 44.037,2.89 C 43.809,2.712 45.237,2.246 46.412,2.075 C 43.062,2.517 43.219,1.415 39.941,2.197 C 40.749,1.63 41.603,1.255 42.465,0.773 C 39.733,0.939 35.943,2.363 37.113,1.068 C 32.657,3.056 24.743,5.847 20.302,10.011 L 20.162,9.078 C 18.127,11.521 11.288,16.374 10.743,19.538 L 10.199,19.665 C 9.14,21.458 8.455,23.49 7.615,25.335 C 6.23,27.695 5.585,26.243 5.782,26.613 C 3.058,32.136 1.705,36.777 0.536,40.583 C 1.369,41.828 0.556,48.078 0.871,53.08 C -0.497,77.784 18.209,101.77 38.656,107.308 C 41.653,108.38 46.11,108.339 49.901,108.449 C 45.428,107.17 44.85,107.771 40.493,106.252 C 37.35,104.772 36.661,103.082 34.435,101.15 L 35.316,102.707 C 30.95,101.162 32.777,100.795 29.225,99.67 L 30.166,98.441 C 28.751,98.334 26.418,96.056 25.78,94.795 L 24.232,94.856 C 22.372,92.561 21.381,90.907 21.453,89.626 L 20.953,90.517 C 20.386,89.544 14.11,81.91 17.366,83.687 C 16.761,83.134 15.957,82.787 15.085,81.203 L 15.748,80.445 C 14.181,78.429 12.864,75.845 12.964,74.984 C 13.8,76.113 14.38,76.324 14.954,76.517 C 10.997,66.699 10.775,75.976 7.778,66.523 L 8.412,66.472 C 7.926,65.74 7.631,64.945 7.24,64.165 L 7.516,61.415 C 4.667,58.121 6.719,47.409 7.13,41.534 C 7.415,39.145 9.508,36.602 11.1,32.614 L 10.13,32.447 C 11.984,29.213 20.716,19.459 24.76,19.961 C 26.719,17.5 24.371,19.952 23.988,19.332 C 28.291,14.879 29.644,16.186 32.548,15.385 C 35.68,13.526 29.86,16.11 31.345,14.676 C 36.759,13.293 35.182,11.532 42.245,10.83 C 42.99,11.254 40.516,11.485 39.895,12.035 C 44.406,9.828 54.17,10.33 60.512,13.26 C 67.871,16.699 76.139,26.865 76.465,36.43 L 76.836,36.53 C 76.648,40.332 77.418,44.729 76.084,48.768 L 76.992,46.856"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13309"
-   d="M 32.372,59.764 L 32.12,61.024 C 33.301,62.628 34.238,64.366 35.746,65.62 C 34.661,63.502 33.855,62.627 32.372,59.764"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13311"
-   d="M 35.164,59.654 C 34.539,58.963 34.169,58.131 33.755,57.302 C 34.151,58.759 34.962,60.011 35.717,61.284 L 35.164,59.654"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13313"
-   d="M 84.568,48.916 L 84.304,49.578 C 83.82,53.016 82.775,56.418 81.173,59.572 C 82.943,56.244 84.088,52.604 84.568,48.916"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13315"
-   d="M 45.527,0.537 C 46.742,0.092 48.514,0.293 49.803,0 C 48.123,0.141 46.451,0.225 44.8,0.438 L 45.527,0.537"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13317"
-   d="M 2.872,23.219 C 3.152,25.811 0.922,26.817 3.366,25.108 C 4.676,22.157 2.854,24.293 2.872,23.219"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13319"
-   d="M 0,35.215 C 0.563,33.487 0.665,32.449 0.88,31.449 C -0.676,33.438 0.164,33.862 0,35.215"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-		</g>
-
-	</g>
-    <g
-       i:rgbTrio="#4F008000FFFF"
-       i:dimmedPercent="50"
-       i:layer="yes"
-       id="g13339"
-       transform="matrix(0.3940442,0,0,0.3454906,440.76152,24.213313)"
-       style="fill:#fcfcfc;display:inline">
-		<g
-   id="g13341"
-   style="fill:#fcfcfc">
-			<path
-   id="path13343"
-   d="M 51.986,57.297 C 50.189,57.322 52.326,58.223 54.672,58.584 C 55.32,58.078 55.908,57.566 56.432,57.068 C 54.971,57.426 53.484,57.434 51.986,57.297"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13345"
-   d="M 61.631,54.893 C 62.701,53.416 63.481,51.799 63.756,50.127 C 63.516,51.319 62.869,52.348 62.26,53.434 C 58.901,55.549 61.944,52.178 62.258,50.897 C 58.646,55.443 61.762,53.623 61.631,54.893"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13347"
-   d="M 65.191,45.629 C 65.408,42.393 64.554,43.416 64.267,44.651 C 64.602,44.825 64.867,46.932 65.191,45.629"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13349"
-   d="M 45.172,1.399 C 46.131,1.571 47.244,1.703 47.088,1.932 C 48.137,1.702 48.375,1.49 45.172,1.399"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13351"
-   d="M 47.088,1.932 L 46.41,2.072 L 47.041,2.016 L 47.088,1.932"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13353"
-   d="M 76.992,46.856 C 77.099,49.762 76.142,51.172 75.279,53.668 L 73.726,54.444 C 72.455,56.912 73.849,56.011 72.939,57.974 C 70.955,59.738 66.918,63.494 65.626,63.837 C 64.683,63.816 66.265,62.724 66.472,62.296 C 63.816,64.12 64.341,65.034 60.279,66.142 L 60.16,65.878 C 50.142,70.591 36.226,61.251 36.409,48.507 C 36.302,49.316 36.105,49.114 35.883,49.441 C 35.366,42.884 38.911,36.298 44.89,33.609 C 50.738,30.714 57.594,31.902 61.783,35.806 C 59.482,32.792 54.902,29.597 49.474,29.896 C 44.157,29.98 39.183,33.359 37.523,37.027 C 34.799,38.742 34.483,43.638 33.296,44.534 C 31.699,56.271 36.3,61.342 44.083,67.307 C 45.308,68.133 44.428,68.258 44.594,68.887 C 42.008,67.676 39.64,65.848 37.693,63.61 C 38.726,65.122 39.841,66.592 41.282,67.747 C 38.844,66.921 35.587,61.839 34.636,61.632 C 38.839,69.157 51.688,74.829 58.416,72.015 C 55.303,72.13 51.348,72.079 47.85,70.786 C 46.381,70.03 44.383,68.464 44.74,68.171 C 53.922,71.601 63.407,70.769 71.352,64.4 C 73.373,62.826 75.581,60.148 76.219,60.111 C 75.258,61.556 76.383,60.806 75.645,62.082 C 77.659,58.834 74.77,60.76 77.727,56.473 L 78.819,57.977 C 78.413,55.281 82.167,52.007 81.786,47.743 C 82.647,46.439 82.747,49.146 81.833,52.146 C 83.101,48.818 82.167,48.283 82.493,45.537 C 82.845,46.46 83.307,47.441 83.544,48.415 C 82.718,45.199 84.392,42.999 84.806,41.13 C 84.398,40.949 83.531,42.552 83.333,38.753 C 83.362,37.103 83.792,37.888 83.958,37.482 C 83.634,37.296 82.784,36.031 82.267,33.605 C 82.642,33.035 83.269,35.083 83.779,35.167 C 83.451,33.238 82.886,31.767 82.863,30.287 C 81.373,27.173 82.336,30.702 81.127,28.95 C 79.541,24.003 82.443,27.802 82.639,25.554 C 85.043,29.037 86.414,34.435 87.043,36.671 C 86.563,33.945 85.787,31.304 84.84,28.749 C 85.57,29.056 83.664,23.14 85.789,27.058 C 83.519,18.706 76.074,10.902 69.225,7.24 C 70.063,8.007 71.121,8.97 70.741,9.121 C 67.335,7.093 67.934,6.935 67.446,6.078 C 64.671,4.949 64.489,6.169 62.651,6.08 C 57.421,3.306 56.413,3.601 51.6,1.863 L 51.819,2.886 C 48.354,1.732 47.782,3.324 44.037,2.89 C 43.809,2.712 45.237,2.246 46.412,2.075 C 43.062,2.517 43.219,1.415 39.941,2.197 C 40.749,1.63 41.603,1.255 42.465,0.773 C 39.733,0.939 35.943,2.363 37.113,1.068 C 32.657,3.056 24.743,5.847 20.302,10.011 L 20.162,9.078 C 18.127,11.521 11.288,16.374 10.743,19.538 L 10.199,19.665 C 9.14,21.458 8.455,23.49 7.615,25.335 C 6.23,27.695 5.585,26.243 5.782,26.613 C 3.058,32.136 1.705,36.777 0.536,40.583 C 1.369,41.828 0.556,48.078 0.871,53.08 C -0.497,77.784 18.209,101.77 38.656,107.308 C 41.653,108.38 46.11,108.339 49.901,108.449 C 45.428,107.17 44.85,107.771 40.493,106.252 C 37.35,104.772 36.661,103.082 34.435,101.15 L 35.316,102.707 C 30.95,101.162 32.777,100.795 29.225,99.67 L 30.166,98.441 C 28.751,98.334 26.418,96.056 25.78,94.795 L 24.232,94.856 C 22.372,92.561 21.381,90.907 21.453,89.626 L 20.953,90.517 C 20.386,89.544 14.11,81.91 17.366,83.687 C 16.761,83.134 15.957,82.787 15.085,81.203 L 15.748,80.445 C 14.181,78.429 12.864,75.845 12.964,74.984 C 13.8,76.113 14.38,76.324 14.954,76.517 C 10.997,66.699 10.775,75.976 7.778,66.523 L 8.412,66.472 C 7.926,65.74 7.631,64.945 7.24,64.165 L 7.516,61.415 C 4.667,58.121 6.719,47.409 7.13,41.534 C 7.415,39.145 9.508,36.602 11.1,32.614 L 10.13,32.447 C 11.984,29.213 20.716,19.459 24.76,19.961 C 26.719,17.5 24.371,19.952 23.988,19.332 C 28.291,14.879 29.644,16.186 32.548,15.385 C 35.68,13.526 29.86,16.11 31.345,14.676 C 36.759,13.293 35.182,11.532 42.245,10.83 C 42.99,11.254 40.516,11.485 39.895,12.035 C 44.406,9.828 54.17,10.33 60.512,13.26 C 67.871,16.699 76.139,26.865 76.465,36.43 L 76.836,36.53 C 76.648,40.332 77.418,44.729 76.084,48.768 L 76.992,46.856"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13355"
-   d="M 32.372,59.764 L 32.12,61.024 C 33.301,62.628 34.238,64.366 35.746,65.62 C 34.661,63.502 33.855,62.627 32.372,59.764"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13357"
-   d="M 35.164,59.654 C 34.539,58.963 34.169,58.131 33.755,57.302 C 34.151,58.759 34.962,60.011 35.717,61.284 L 35.164,59.654"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13359"
-   d="M 84.568,48.916 L 84.304,49.578 C 83.82,53.016 82.775,56.418 81.173,59.572 C 82.943,56.244 84.088,52.604 84.568,48.916"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13361"
-   d="M 45.527,0.537 C 46.742,0.092 48.514,0.293 49.803,0 C 48.123,0.141 46.451,0.225 44.8,0.438 L 45.527,0.537"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13363"
-   d="M 2.872,23.219 C 3.152,25.811 0.922,26.817 3.366,25.108 C 4.676,22.157 2.854,24.293 2.872,23.219"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-			<path
-   id="path13365"
-   d="M 0,35.215 C 0.563,33.487 0.665,32.449 0.88,31.449 C -0.676,33.438 0.164,33.862 0,35.215"
-   i:knockout="Off"
-   style="fill:#fcfcfc" />
-
-		</g>
-
-	</g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="menu"
-     sodipodi:insensitive="true">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#4c0000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4291"
-       width="384.84058"
-       height="197.2863"
-       x="133.36841"
-       y="150.73456" />
-  </g>
-</svg>
diff --git a/templates/syslinux/menu/exithelp.cfg b/templates/syslinux/menu/exithelp.cfg
new file mode 100644
index 000000000..a538904bd
--- /dev/null
+++ b/templates/syslinux/menu/exithelp.cfg
@@ -0,0 +1,3 @@
+label menu
+	kernel {$LIVE_DATA_PATH}/vesamenu.c32
+	config isolinux.cfg
diff --git a/templates/syslinux/menu/footer.cfg b/templates/syslinux/menu/footer.cfg
deleted file mode 100644
index beef0f4b3..000000000
--- a/templates/syslinux/menu/footer.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label help
-        menu label ^Help
-        say 
-        config {$LIVE_SCREEN_PATH}/prompt.cfg
diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg
deleted file mode 100644
index 9d89bdc62..000000000
--- a/templates/syslinux/menu/header.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-default            {$LIVE_DATA_PATH}/vesamenu.c32
-font               {$LIVE_DATA_PATH}/iso01.f14.psf
-
-timeout            {$LH_SYSLINUX_TIMEOUT}
-prompt             0
-
-menu background    {$SPLASH}
-menu color border       * #00000000 #00000000 none
-menu color sel          * #ffffffff #ff4c0000 none
-menu color unsel        * #ff4c0000 #00000000 none
-menu color hotsel       * #fffc1818 #ff4c0000 none
-menu color hotkey       * #fffc1818 #ffffffff none
-menu color tabmsg       * #ff4c0000 #00000000 none
-menu color timeout_msg  * #ff4c0000 #00000000 none
-menu color timeout      * #fffc1818 #00000000 none
-menu vshift        8
-menu hshift        5
-menu width         70
-menu tabmsg        Press [Tab] to edit the menu entry
-menu autoboot      Boot default in # seconds
-menu timeoutrow    16
diff --git a/templates/syslinux/menu/menu.cfg b/templates/syslinux/menu/menu.cfg
new file mode 100644
index 000000000..53865b2c2
--- /dev/null
+++ b/templates/syslinux/menu/menu.cfg
@@ -0,0 +1,12 @@
+menu hshift 13
+menu width 49
+
+menu title Debian boot menu
+include stdmenu.cfg
+include live.cfg
+label help
+	menu label ^Help
+	text help
+   Display help screens; type 'menu' at boot prompt to return to this menu
+	endtext
+	config prompt.cfg
diff --git a/templates/syslinux/menu/prompt.cfg b/templates/syslinux/menu/prompt.cfg
index 3ea1ab4d9..691ebda7b 100644
--- a/templates/syslinux/menu/prompt.cfg
+++ b/templates/syslinux/menu/prompt.cfg
@@ -1,6 +1,16 @@
 prompt 1
-timeout {$LH_SYSLINUX_TIMEOUT}
-default live
-display {$LIVE_SCREEN_PATH}/f1.txt
-include {$LIVE_SCREEN_PATH}/menu.cfg
-include {$LIVE_SCREEN_PATH}/help.cfg
+display f1.txt
+timeout 0
+include menu.cfg
+include exithelp.cfg
+
+f1 f1.txt
+f2 f2.txt
+f3 f3.txt
+f4 f4.txt
+f5 f5.txt
+f6 f6.txt
+f7 f7.txt
+f8 f8.txt
+f9 f9.txt
+f0 f10.txt
diff --git a/templates/syslinux/menu/splash.png b/templates/syslinux/menu/splash.png
new file mode 100644
index 000000000..75f1a3c41
--- /dev/null
+++ b/templates/syslinux/menu/splash.png
diff --git a/templates/syslinux/menu/stdmenu.cfg b/templates/syslinux/menu/stdmenu.cfg
new file mode 100644
index 000000000..9b10dea27
--- /dev/null
+++ b/templates/syslinux/menu/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background {$SPLASH}
+menu color title	* #FFFFFFFF *
+menu color border	* #00000000 #00000000 none
+menu color sel		* #ffffffff #76a1d0ff *
+menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg	* #ffffffff #00000000 *
+menu color help		37;40 #ffdddd00 #00000000 none
+menu vshift 12
+menu rows 10
+menu helpmsgrow 15
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 16
+menu timeoutrow 16
+menu tabmsgrow 18
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/templates/syslinux/menu/syslinux.cfg b/templates/syslinux/menu/syslinux.cfg
new file mode 100644
index 000000000..fa55a7c1e
--- /dev/null
+++ b/templates/syslinux/menu/syslinux.cfg
@@ -0,0 +1,4 @@
+include menu.cfg
+default {$LIVE_DATA_PATH}/vesamenu.c32
+prompt 0
+timeout {$LH_SYSLINUX_TIMEOUT}
diff --git a/templates/syslinux/common/help.cfg b/templates/syslinux/normal/help.cfg
index 414f3885e..414f3885e 100644
--- a/templates/syslinux/common/help.cfg
+++ b/templates/syslinux/normal/help.cfg
diff --git a/templates/syslinux/normal/data/splash.rle b/templates/syslinux/normal/splash.rle
index df3e15de2..df3e15de2 100644
--- a/templates/syslinux/normal/data/splash.rle
+++ b/templates/syslinux/normal/splash.rle
diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/normal/syslinux.cfg
index 3e2682eb3..3e2682eb3 100644
--- a/templates/syslinux/common/syslinux.cfg
+++ b/templates/syslinux/normal/syslinux.cfg