From 1fff7803f848b82e24ac3abe7f8693c243d88169 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 2 Oct 2007 20:25:38 -0300
Subject: 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.
---
 templates/syslinux/common/help.cfg     | 10 ++++++++++
 templates/syslinux/common/menu.cfg     |  2 --
 templates/syslinux/common/prompt.cfg   | 15 ---------------
 templates/syslinux/common/syslinux.cfg |  3 ---
 templates/syslinux/menu/prompt.cfg     |  6 ++++++
 templates/syslinux/normal/prompt.cfg   |  6 ++++++
 6 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 templates/syslinux/common/help.cfg
 delete mode 100644 templates/syslinux/common/prompt.cfg
 create mode 100644 templates/syslinux/menu/prompt.cfg
 create mode 100644 templates/syslinux/normal/prompt.cfg

(limited to 'templates')

diff --git a/templates/syslinux/common/help.cfg b/templates/syslinux/common/help.cfg
new file mode 100644
index 000000000..d06fc1879
--- /dev/null
+++ b/templates/syslinux/common/help.cfg
@@ -0,0 +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
diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg
index f84260c39..093ca0f10 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/prompt.cfg b/templates/syslinux/common/prompt.cfg
deleted file mode 100644
index 32dd85c41..000000000
--- a/templates/syslinux/common/prompt.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-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 b930e36f7..83c7a8aba 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 000000000..8a46c5211
--- /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 000000000..26d5517d1
--- /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
-- 
cgit v1.2.3