syslinux: split syslinux configuration in multiple files

Normal and menu templates share a lot of common stuff and then
a splited syslinux.cfg is much better to handle that.

8 files changed, 60 insertions, 56 deletions

diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg
new file mode 100644
index 000000000..f84260c39
--- /dev/null
+++ b/templates/syslinux/common/menu.cfg
@@ -0,0 +1,19 @@
+default live
+
+LINUX_LIVE
+
+LINUX_INSTALL
+
+MEMTEST
+
+#label floppy
+#	localboot 0x00
+
+#label disk1
+#	localboot 0x80
+
+#label disk2
+#	localboot 0x81
+
+#label nextboot
+#	localboot -1
diff --git a/templates/syslinux/common/prompt.cfg b/templates/syslinux/common/prompt.cfg
new file mode 100644
index 000000000..32dd85c41
--- /dev/null
+++ b/templates/syslinux/common/prompt.cfg
@@ -0,0 +1,15 @@
+prompt 1
+display boot.txt
+timeout 0
+include menu.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/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg
index 526f1d4ae..b930e36f7 100644
--- a/templates/syslinux/common/syslinux.cfg
+++ b/templates/syslinux/common/syslinux.cfg
@@ -1,36 +1,6 @@
-
+include header.cfg
+include menu.cfg
+include footer.cfg
 DISPLAY boot.txt
 
-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
-
-DEFAULT live
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
-
-#LABEL floppy
-#	localboot 0x00
-
-#LABEL disk1
-#	localboot 0x80
-
-#LABEL disk2
-#	localboot 0x81
-
-#LABEL nextboot
-#	localboot -1
-
 PROMPT 1
-TIMEOUT LINUX_TIMEOUT
diff --git a/templates/syslinux/menu/footer.cfg b/templates/syslinux/menu/footer.cfg
new file mode 100644
index 000000000..a59d9dce0
--- /dev/null
+++ b/templates/syslinux/menu/footer.cfg
@@ -0,0 +1,4 @@
+label help
+        menu label ^Help
+        say 
+        config prompt.cfg
diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg
new file mode 100644
index 000000000..30878ae84
--- /dev/null
+++ b/templates/syslinux/menu/header.cfg
@@ -0,0 +1,17 @@
+font               data/lat1-16.psf
+default            data/vesamenu.c32
+
+timeout            1000
+prompt             0
+
+menu background    data/splash.png
+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 hotkey  1;37;40;44 #90ffffff #00000000 std
+menu vshift        7
+menu hshift        6
+menu width         67
+menu tabmsg        Press [tab] to edit the menu entry
+menu timeoutrow    16
diff --git a/templates/syslinux/menu/syslinux.cfg b/templates/syslinux/menu/syslinux.cfg
deleted file mode 100644
index 887e3d8a4..000000000
--- a/templates/syslinux/menu/syslinux.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-FONT               data/lat1-16.psf
-DEFAULT            data/vesamenu.c32
-
-TIMEOUT            1000
-PROMPT             0
-
-MENU BACKGROUND    data/splash.png
-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 HOTKEY  1;37;40;44 #90ffffff #00000000 std
-MENU VSHIFT        7
-MENU HSHIFT        6
-MENU WIDTH         67
-MENU TABMSG        Press [tab] to edit the menu entry
-MENU TIMEOUTROW    16
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
diff --git a/templates/syslinux/normal/footer.cfg b/templates/syslinux/normal/footer.cfg
new file mode 100644
index 000000000..e65904917
--- /dev/null
+++ b/templates/syslinux/normal/footer.cfg
@@ -0,0 +1 @@
+timeout LINUX_TIMEOUT
diff --git a/templates/syslinux/normal/header.cfg b/templates/syslinux/normal/header.cfg
new file mode 100644
index 000000000..58d978088
--- /dev/null
+++ b/templates/syslinux/normal/header.cfg
@@ -0,0 +1 @@
+include prompt.cfg