From 7f9d996f19f1454ae8f525042a2d98c91142f963 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 25 Sep 2007 14:01:44 -0300
Subject: templates: move syslinux-menu to syslinux/menu
All files from syslinux-menu templates directory has been moved to
syslinux/menu. lh_binary_syslinux had some changes to work with that
but they were minimal ones.
---
helpers/lh_binary_syslinux | 13 +++++++------
templates/syslinux-menu/data/lat1-16.psf | Bin 5156 -> 0 bytes
templates/syslinux-menu/data/splash.png | Bin 57186 -> 0 bytes
templates/syslinux-menu/isolinux.cfg | 23 -----------------------
templates/syslinux/menu/data/lat1-16.psf | Bin 0 -> 5156 bytes
templates/syslinux/menu/data/splash.png | Bin 0 -> 57186 bytes
templates/syslinux/menu/syslinux.cfg | 23 +++++++++++++++++++++++
7 files changed, 30 insertions(+), 29 deletions(-)
delete mode 100644 templates/syslinux-menu/data/lat1-16.psf
delete mode 100644 templates/syslinux-menu/data/splash.png
delete mode 100644 templates/syslinux-menu/isolinux.cfg
create mode 100644 templates/syslinux/menu/data/lat1-16.psf
create mode 100644 templates/syslinux/menu/data/splash.png
create mode 100644 templates/syslinux/menu/syslinux.cfg
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 3f8cb40..9736377 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -47,12 +47,7 @@ Require_stagefile .stage/bootstrap
Check_stagefile .stage/binary_syslinux
# Checking syslinux templates
-if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
-then
- Check_templates syslinux
-else
- Check_templates syslinux-menu
-fi
+Check_templates syslinux
# Checking lock file
Check_lockfile .lock
@@ -363,7 +358,13 @@ case "${LH_BINARY_IMAGES}" in
;;
esac
+ # Syslinux templates
cp -r "${TEMPLATES}"/common/* binary/isolinux
+ if [ "${LH_SYSLINUX_MENU}" != "disabled" ]
+ then
+ cp -r "${TEMPLATES}"/menu/* binary/isolinux
+ fi
+
if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
then
cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* binary/isolinux
diff --git a/templates/syslinux-menu/data/lat1-16.psf b/templates/syslinux-menu/data/lat1-16.psf
deleted file mode 100644
index 097a640..0000000
Binary files a/templates/syslinux-menu/data/lat1-16.psf and /dev/null differ
diff --git a/templates/syslinux-menu/data/splash.png b/templates/syslinux-menu/data/splash.png
deleted file mode 100644
index 5669615..0000000
Binary files a/templates/syslinux-menu/data/splash.png and /dev/null differ
diff --git a/templates/syslinux-menu/isolinux.cfg b/templates/syslinux-menu/isolinux.cfg
deleted file mode 100644
index 887e3d8..0000000
--- a/templates/syslinux-menu/isolinux.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-FONT data/lat1-16.psf
-DEFAULT data/vesamenu.c32
-
-TIMEOUT 1000
-PROMPT 0
-
-MENU BACKGROUND data/splash.png
-MENU COLOR TITLE * #FFFFFFFF *
-MENU COLOR BORDER * #00000000 #00000000 none
-MENU COLOR SEL * #ffffffff #76a1d0ff *
-MENU COLOR HOTSEL 1;7;37;40 #ffffffff #76a1d0ff *
-MENU COLOR HOTKEY 1;37;40;44 #90ffffff #00000000 std
-MENU VSHIFT 7
-MENU HSHIFT 6
-MENU WIDTH 67
-MENU TABMSG Press [tab] to edit the menu entry
-MENU TIMEOUTROW 16
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
diff --git a/templates/syslinux/menu/data/lat1-16.psf b/templates/syslinux/menu/data/lat1-16.psf
new file mode 100644
index 0000000..097a640
Binary files /dev/null and b/templates/syslinux/menu/data/lat1-16.psf differ
diff --git a/templates/syslinux/menu/data/splash.png b/templates/syslinux/menu/data/splash.png
new file mode 100644
index 0000000..5669615
Binary files /dev/null and b/templates/syslinux/menu/data/splash.png differ
diff --git a/templates/syslinux/menu/syslinux.cfg b/templates/syslinux/menu/syslinux.cfg
new file mode 100644
index 0000000..887e3d8
--- /dev/null
+++ b/templates/syslinux/menu/syslinux.cfg
@@ -0,0 +1,23 @@
+FONT data/lat1-16.psf
+DEFAULT data/vesamenu.c32
+
+TIMEOUT 1000
+PROMPT 0
+
+MENU BACKGROUND data/splash.png
+MENU COLOR TITLE * #FFFFFFFF *
+MENU COLOR BORDER * #00000000 #00000000 none
+MENU COLOR SEL * #ffffffff #76a1d0ff *
+MENU COLOR HOTSEL 1;7;37;40 #ffffffff #76a1d0ff *
+MENU COLOR HOTKEY 1;37;40;44 #90ffffff #00000000 std
+MENU VSHIFT 7
+MENU HSHIFT 6
+MENU WIDTH 67
+MENU TABMSG Press [tab] to edit the menu entry
+MENU TIMEOUTROW 16
+
+LINUX_LIVE
+
+LINUX_INSTALL
+
+MEMTEST
--
cgit v1.0