From ae7d46ca728ca4369981f5601bd5962e186e2248 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 2 Oct 2007 20:25:38 -0300
Subject: [PATCH] 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/{prompt.cfg => help.cfg} | 5 -----
 templates/syslinux/common/menu.cfg                 | 2 --
 templates/syslinux/common/syslinux.cfg             | 3 ---
 templates/syslinux/menu/prompt.cfg                 | 6 ++++++
 templates/syslinux/normal/prompt.cfg               | 6 ++++++
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename templates/syslinux/common/{prompt.cfg => help.cfg} (65%)
 create mode 100644 templates/syslinux/menu/prompt.cfg
 create mode 100644 templates/syslinux/normal/prompt.cfg

diff --git a/templates/syslinux/common/prompt.cfg b/templates/syslinux/common/help.cfg
similarity index 65%
rename from templates/syslinux/common/prompt.cfg
rename to templates/syslinux/common/help.cfg
index 32dd85c41..d06fc1879 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 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/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