Unify syslinux code, so that pxelinux isolinux & usb-hdd

share more code.

Change pxelinux directory setup to match debian installer

Change syslinux templates to use {$VAR} syntax so the
templates are easier to read

Remove etch support for syslinux, since INCLUDE syntax
is not available in etch syslinux v3.31

4 files changed, 16 insertions, 16 deletions

diff --git a/templates/syslinux/common/help.cfg b/templates/syslinux/common/help.cfg
index d06fc18..414f388 100644
--- a/templates/syslinux/common/help.cfg
+++ b/templates/syslinux/common/help.cfg
@@ -1,10 +1,10 @@
-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
+f1 {$LIVE_SCREEN_PATH}/f1.txt
+f2 {$LIVE_SCREEN_PATH}/f2.txt
+f3 {$LIVE_SCREEN_PATH}/f3.txt
+f4 {$LIVE_SCREEN_PATH}/f4.txt
+f5 {$LIVE_SCREEN_PATH}/f5.txt
+f6 {$LIVE_SCREEN_PATH}/f6.txt
+f7 {$LIVE_SCREEN_PATH}/f7.txt
+f8 {$LIVE_SCREEN_PATH}/f8.txt
+f9 {$LIVE_SCREEN_PATH}/f9.txt
+f0 {$LIVE_SCREEN_PATH}/f10.txt
diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg
index 093ca0f..b5a6e5c 100644
--- a/templates/syslinux/common/menu.cfg
+++ b/templates/syslinux/common/menu.cfg
@@ -1,8 +1,8 @@
-LINUX_LIVE
+{$LINUX_LIVE}
 
-LINUX_INSTALL
+{$LINUX_INSTALL}
 
-MEMTEST
+{$MEMTEST}
 
 #label floppy
 #	localboot 0x00
diff --git a/templates/syslinux/common/splash.rle b/templates/syslinux/common/splash.rle
deleted file mode 100644
index df3e15d..0000000
--- a/templates/syslinux/common/splash.rle
+++ /dev/null
diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg
index 83c7a8a..3e2682e 100644
--- a/templates/syslinux/common/syslinux.cfg
+++ b/templates/syslinux/common/syslinux.cfg
@@ -1,3 +1,3 @@
-include header.cfg
-include menu.cfg
-include footer.cfg
+include {$LIVE_SCREEN_PATH}/header.cfg
+include {$LIVE_SCREEN_PATH}/menu.cfg
+include {$LIVE_SCREEN_PATH}/footer.cfg