summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-10-02 20:25:38 -0300
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commit1fff7803f848b82e24ac3abe7f8693c243d88169 (patch)
treea81d9bf923f3a65ffd16c967cf17a52fb1b791df
parent7647762eff52dd778e1b1feba29db9e784acb739 (diff)
downloadlive-build-1fff7803f848b82e24ac3abe7f8693c243d88169.zip
live-build-1fff7803f848b82e24ac3abe7f8693c243d88169.tar.gz
templates: split syslinux templates to reduce diverting
A new common template called help.cfg has been included to avoid help keys to be duplicated while prompt.cfg has been changed to be specific to each mode since it has different requirements for initial text to be displayed. Other minor fixes were also been done during the spliting and then included on this patch too.
-rw-r--r--templates/syslinux/common/help.cfg (renamed from templates/syslinux/common/prompt.cfg)5
-rw-r--r--templates/syslinux/common/menu.cfg2
-rw-r--r--templates/syslinux/common/syslinux.cfg3
-rw-r--r--templates/syslinux/menu/prompt.cfg6
-rw-r--r--templates/syslinux/normal/prompt.cfg6
5 files changed, 12 insertions, 10 deletions
diff --git a/templates/syslinux/common/prompt.cfg b/templates/syslinux/common/help.cfg
index 32dd85c..d06fc18 100644
--- a/templates/syslinux/common/prompt.cfg
+++ b/templates/syslinux/common/help.cfg
@@ -1,8 +1,3 @@
-prompt 1
-display boot.txt
-timeout 0
-include menu.cfg
-
f1 f1.txt
f2 f2.txt
f3 f3.txt
diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg
index f84260c..093ca0f 100644
--- a/templates/syslinux/common/menu.cfg
+++ b/templates/syslinux/common/menu.cfg
@@ -1,5 +1,3 @@
-default live
-
LINUX_LIVE
LINUX_INSTALL
diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg
index b930e36..83c7a8a 100644
--- a/templates/syslinux/common/syslinux.cfg
+++ b/templates/syslinux/common/syslinux.cfg
@@ -1,6 +1,3 @@
include header.cfg
include menu.cfg
include footer.cfg
-DISPLAY boot.txt
-
-PROMPT 1
diff --git a/templates/syslinux/menu/prompt.cfg b/templates/syslinux/menu/prompt.cfg
new file mode 100644
index 0000000..8a46c52
--- /dev/null
+++ b/templates/syslinux/menu/prompt.cfg
@@ -0,0 +1,6 @@
+prompt 1
+timeout 0
+default live
+display f1.txt
+include menu.cfg
+include help.cfg
diff --git a/templates/syslinux/normal/prompt.cfg b/templates/syslinux/normal/prompt.cfg
new file mode 100644
index 0000000..26d5517
--- /dev/null
+++ b/templates/syslinux/normal/prompt.cfg
@@ -0,0 +1,6 @@
+prompt 1
+timeout 0
+default live
+display boot.txt
+include menu.cfg
+include help.cfg