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

19 files changed, 49 insertions, 49 deletions

diff --git a/templates/syslinux/ca/boot.txt b/templates/syslinux/ca/boot.txt
index 55fad73..095a0a4 100644
--- a/templates/syslinux/ca/boot.txt
+++ b/templates/syslinux/ca/boot.txt
@@ -1,3 +1,3 @@
-splash.rle
+{$SPLASH}
 
 Premeu  F1 i control, i llavors el 1 per obtenir ajuda, o INTRO per fer el 
diff --git a/templates/syslinux/ca/f1.txt.install b/templates/syslinux/ca/f1.txt.install
index 9298171..0a49d8d 100644
--- a/templates/syslinux/ca/f1.txt.install
+++ b/templates/syslinux/ca/f1.txt.install
@@ -1,7 +1,7 @@
                   0fBenvingut a Debian GNU/Linux!07                               09F107
 
-Aix• ‚s un Debian LH_DISTRIBUTION combinat live i d'instalúlaci¢ dins un LH_MEDIA.
-Fet el LH_DATE.
+Aix• ‚s un Debian {$LH_DISTRIBUTION} combinat live i d'instalúlaci¢ dins un {$LH_MEDIA}.
+Fet el {$LH_DATE}.
 
 0fMEN£ DE LES AJUDES07
 
@@ -9,7 +9,7 @@ Fet el LH_DATE.
 
 <09F107>   Aquesta p…gina, l'¡ndex.
 <09F207>   Prerequisits per instalúlar Debian.
-<09F307>   MŠtodes d'arrencada per a usos especials d'aquest LH_MEDIA.
+<09F307>   MŠtodes d'arrencada per a usos especials d'aquest {$LH_MEDIA}.
 <09F407>   MŠtodes addicionals d'arrencada; mode de rescat.
 <09F507>   Rep…s dels par…metres especials d'arrencada.
 <09F607>   Par…metres especials per algunes m…quines.
diff --git a/templates/syslinux/ca/f1.txt.live b/templates/syslinux/ca/f1.txt.live
index 8f87c5c..c314f28 100644
--- a/templates/syslinux/ca/f1.txt.live
+++ b/templates/syslinux/ca/f1.txt.live
@@ -1,7 +1,7 @@
                   0fBenvingut a Debian GNU/Linux!07                               09F107
 
-Aix• ‚s una Debian LH_DISTRIBUTION live dins un LH_MEDIA.
-Fet el LH_DATE.
+Aix• ‚s una Debian {$LH_DISTRIBUTION} live dins un {$LH_MEDIA}.
+Fet el {$LH_DATE}.
 
 0fMEN£ DE LES AJUDES07
 
@@ -9,7 +9,7 @@ Fet el LH_DATE.
 
 <09F107>   Aquesta p…gina, l'¡ndex.
 <09F207>   Prerequisits per instalúlar Debian.
-<09F307>   MŠtodes d'arrencada per a usos especials d'aquest LH_MEDIA
+<09F307>   MŠtodes d'arrencada per a usos especials d'aquest {$LH_MEDIA}
 <09F407>   MŠtodes addicionals d'arrencada.
 <09F507>   Rep…s dels par…metres especials d'arrencada.
 <09F607>   Par…metres especials per algunes m…quines.
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/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
diff --git a/templates/syslinux/en/boot.txt b/templates/syslinux/en/boot.txt
index 56dffca..ecb5dfc 100644
--- a/templates/syslinux/en/boot.txt
+++ b/templates/syslinux/en/boot.txt
@@ -1,3 +1,3 @@
-splash.rle
+{$SPLASH}
 
 Press F1control and F then 1 for help, or ENTER to 
diff --git a/templates/syslinux/en/f1.txt.install b/templates/syslinux/en/f1.txt.install
index 80026b6..f49f549 100644
--- a/templates/syslinux/en/f1.txt.install
+++ b/templates/syslinux/en/f1.txt.install
@@ -1,7 +1,7 @@
                   0fWelcome to Debian GNU/Linux!07                                09F107
 
-This is a Debian LH_DISTRIBUTION combined live and installation LH_MEDIA.
-It was built on LH_DATE.
+This is a Debian {$LH_DISTRIBUTION} combined live and installation {$LH_MEDIA}.
+It was built on {$LH_DATE}.
 
 0fHELP INDEX07
 
@@ -9,7 +9,7 @@ It was built on LH_DATE.
 
 <09F107>   This page, the help index.
 <09F207>   Prerequisites for installing Debian.
-<09F307>   Boot methods for special ways of using this LH_MEDIA
+<09F307>   Boot methods for special ways of using this {$LH_MEDIA}
 <09F407>   Additional boot methods; rescue mode.
 <09F507>   Special boot parameters, overview.
 <09F607>   Special boot parameters for special machines.
diff --git a/templates/syslinux/en/f1.txt.live b/templates/syslinux/en/f1.txt.live
index f6f33ef..de32d52 100644
--- a/templates/syslinux/en/f1.txt.live
+++ b/templates/syslinux/en/f1.txt.live
@@ -1,7 +1,7 @@
                   0fWelcome to Debian GNU/Linux!07                                09F107
 
-This is a Debian LH_DISTRIBUTION live LH_MEDIA.
-It was built on LH_DATE.
+This is a Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
+It was built on {$LH_DATE}.
 
 0fHELP INDEX07
 
@@ -9,7 +9,7 @@ It was built on LH_DATE.
 
 <09F107>   This page, the help index.
 <09F207>   Prerequisites for installing Debian.
-<09F307>   Boot methods for special ways of using this LH_MEDIA
+<09F307>   Boot methods for special ways of using this {$LH_MEDIA}
 <09F407>   Additional boot methods.
 <09F507>   Special boot parameters, overview.
 <09F607>   Special boot parameters for special machines.
diff --git a/templates/syslinux/es/boot.txt b/templates/syslinux/es/boot.txt
index 064172a..55b3b2e 100644
--- a/templates/syslinux/es/boot.txt
+++ b/templates/syslinux/es/boot.txt
@@ -1,3 +1,3 @@
-splash.rle
+{$SPLASH}
 
 Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
diff --git a/templates/syslinux/es/f1.txt.install b/templates/syslinux/es/f1.txt.install
index 9cbdc6c..326dc7e 100644
--- a/templates/syslinux/es/f1.txt.install
+++ b/templates/syslinux/es/f1.txt.install
@@ -1,7 +1,7 @@
                   0f­Bienvenido a Debian GNU/Linux!07                             09F107
 
-Esto es una Debian LH_DISTRIBUTION combinada live e instalaci¢n de LH_MEDIA.
-Fue construida el LH_DATE.
+Esto es una Debian {$LH_DISTRIBUTION} combinada live e instalaci¢n de {$LH_MEDIA}.
+Fue construida el {$LH_DATE}.
 
 0fMEN£ DE AYUDA07
 
@@ -9,7 +9,7 @@ Fue construida el LH_DATE.
 
 <09F107>   Esta p gina, el ¡ndice.
 <09F207>   Prerrequisitos para instalar Debian.
-<09F307>   M‚todos de arranques especiales usando este LH_MEDIA
+<09F307>   M‚todos de arranques especiales usando este {$LH_MEDIA}
 <09F407>   M‚todos adicionales de arranque; modo de rescate.
 <09F507>   Repaso de los par metros especiales de arranque.
 <09F607>   Par metros especiales para algunas m quinas especiales.
diff --git a/templates/syslinux/es/f1.txt.live b/templates/syslinux/es/f1.txt.live
index e449f9e..911c618 100644
--- a/templates/syslinux/es/f1.txt.live
+++ b/templates/syslinux/es/f1.txt.live
@@ -1,7 +1,7 @@
                   0f­Bienvenido a Debian GNU/Linux!07                               09F107
 
-Esto es una Debian LH_DISTRIBUTION live de LH_MEDIA.
-Fue construida el LH_DATE.
+Esto es una Debian {$LH_DISTRIBUTION} live de ${LH_MEDIA}.
+Fue construida el {$LH_DATE}.
 
 0fMEN£ DE AYUDA07
 
@@ -9,7 +9,7 @@ Fue construida el LH_DATE.
 
 <09F107>   Esta p gina, el ¡ndice.
 <09F207>   Prerrequisitos para instalar Debian.
-<09F307>   M‚todos de arranques especiales usando este LH_MEDIA.
+<09F307>   M‚todos de arranques especiales usando este {$LH_MEDIA}.
 <09F407>   M‚todos adicionales de arranque.
 <09F507>   Repaso de los par metros especiales de arranque.
 <09F607>   Par metros especiales para algunas m quinas especiales.
diff --git a/templates/syslinux/menu/footer.cfg b/templates/syslinux/menu/footer.cfg
index a59d9dc..beef0f4 100644
--- a/templates/syslinux/menu/footer.cfg
+++ b/templates/syslinux/menu/footer.cfg
@@ -1,4 +1,4 @@
 label help
         menu label ^Help
         say 
-        config prompt.cfg
+        config {$LIVE_SCREEN_PATH}/prompt.cfg
diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg
index 9452115..56c5efd 100644
--- a/templates/syslinux/menu/header.cfg
+++ b/templates/syslinux/menu/header.cfg
@@ -1,10 +1,10 @@
-default            data/vesamenu.c32
-font               data/iso01.f14.psf
+default            {$LIVE_DATA_PATH}/vesamenu.c32
+font               {$LIVE_DATA_PATH}/iso01.f14.psf
 
 timeout            1000
 prompt             0
 
-menu background    data/splash.png
+menu background    {$SPLASH}
 menu color title   * #ffffffff *
 menu color border  * #00000000 #00000000 none
 menu color sel     * #ffffffff #76a1d0ff *
diff --git a/templates/syslinux/menu/prompt.cfg b/templates/syslinux/menu/prompt.cfg
index 8a46c52..d5b1831 100644
--- a/templates/syslinux/menu/prompt.cfg
+++ b/templates/syslinux/menu/prompt.cfg
@@ -1,6 +1,6 @@
 prompt 1
 timeout 0
 default live
-display f1.txt
-include menu.cfg
-include help.cfg
+display {$LIVE_SCREEN_PATH}/f1.txt
+include {$LIVE_SCREEN_PATH}/menu.cfg
+include {$LIVE_SCREEN_PATH}/help.cfg
diff --git a/templates/syslinux/common/splash.rle b/templates/syslinux/normal/data/splash.rle
index df3e15d..df3e15d 100644
--- a/templates/syslinux/common/splash.rle
+++ b/templates/syslinux/normal/data/splash.rle
diff --git a/templates/syslinux/normal/footer.cfg b/templates/syslinux/normal/footer.cfg
index e659049..368c307 100644
--- a/templates/syslinux/normal/footer.cfg
+++ b/templates/syslinux/normal/footer.cfg
@@ -1 +1 @@
-timeout LINUX_TIMEOUT
+timeout {$LINUX_TIMEOUT}
diff --git a/templates/syslinux/normal/header.cfg b/templates/syslinux/normal/header.cfg
index 58d9780..26e3115 100644
--- a/templates/syslinux/normal/header.cfg
+++ b/templates/syslinux/normal/header.cfg
@@ -1 +1 @@
-include prompt.cfg
+include {$LIVE_SCREEN_PATH}/prompt.cfg
diff --git a/templates/syslinux/normal/prompt.cfg b/templates/syslinux/normal/prompt.cfg
index 26d5517..97ed60c 100644
--- a/templates/syslinux/normal/prompt.cfg
+++ b/templates/syslinux/normal/prompt.cfg
@@ -1,6 +1,6 @@
 prompt 1
 timeout 0
 default live
-display boot.txt
-include menu.cfg
-include help.cfg
+display {$LIVE_SCREEN_PATH}/boot.txt
+include {$LIVE_SCREEN_PATH}/menu.cfg
+include {$LIVE_SCREEN_PATH}/help.cfg