summaryrefslogtreecommitdiff
path: root/templates/syslinux/normal
diff options
context:
space:
mode:
authorJesse Hathaway <jesse@mbuki-mvuki.org>2007-10-13 13:34:59 -0400
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commit1bea707a71a750a1277376758d5a73df2261cb47 (patch)
tree25b4db3ae62a2c024afe0cbd9544c4b764cc298b /templates/syslinux/normal
parent2a5637facdd807d7724251a9983d4c90a676c5c3 (diff)
downloadlive-build-1bea707a71a750a1277376758d5a73df2261cb47.zip
live-build-1bea707a71a750a1277376758d5a73df2261cb47.tar.gz
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
Diffstat (limited to 'templates/syslinux/normal')
-rw-r--r--templates/syslinux/normal/data/splash.rlebin0 -> 10489 bytes
-rw-r--r--templates/syslinux/normal/footer.cfg2
-rw-r--r--templates/syslinux/normal/header.cfg2
-rw-r--r--templates/syslinux/normal/prompt.cfg6
4 files changed, 5 insertions, 5 deletions
diff --git a/templates/syslinux/normal/data/splash.rle b/templates/syslinux/normal/data/splash.rle
new file mode 100644
index 0000000..df3e15d
--- /dev/null
+++ b/templates/syslinux/normal/data/splash.rle
Binary files differ
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