disputable realization of pxe-theme as default

openslx theme will now be used as default
all theming definitions should take place in a separate file
general configuration should take place via slxsettings
        pxe-passwd='secret'
        pxe-theme='openslx'
        pxe-timeout='100'
        pxe-title='Welcome to OpenSLX'
        pxe-totaltimeout='600'
        tftp-server-ip='132.230.4.4'
for further tests an include file in etc/opt could be used, which will be loaded at the end
i had to introduce tftp-server-ip in slxsettings since i need the ip for (vesa)menu.c32 and the image
do you thionk it's to complicated now?
we can still change it, any better ideas, simplifications?

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2793 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 16 insertions, 102 deletions

diff --git a/boot-env/pxe/menu-include b/boot-env/pxe/menu-include
new file mode 100644
index 00000000..490e9357
--- /dev/null
+++ b/boot-env/pxe/menu-include
@@ -0,0 +1,8 @@
+# /etc/opt/openslx/boot-env/pxe/menu-include
+# this include file will be loaded at the end and will overwrite existing defs
+# for theme configuration use theme.conf in your theme directory
+# general settings can be set via slxsettings
+
+# example german help:
+# MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben:
+# MENU AUTOBOOT Auswahl startet in # Sekunden
diff --git a/boot-env/pxe/menu-template.example b/boot-env/pxe/menu-template.example
deleted file mode 100644
index 4386323a..00000000
--- a/boot-env/pxe/menu-template.example
+++ /dev/null
@@ -1,8 +0,0 @@
-NOESCAPE 0
-PROMPT 0
-TIMEOUT 100
-DEFAULT menu.c32
-IMPLICIT 1
-ALLOWOPTIONS 1
-MENU TITLE Was möchten Sie tun (Auswahl mittels Cursortasten)?
-MENU MASTER PASSWD secret
diff --git a/boot-env/pxe/themes/openslx/default b/boot-env/pxe/themes/openslx/default
deleted file mode 100644
index dfc580a0..00000000
--- a/boot-env/pxe/themes/openslx/default
+++ /dev/null
@@ -1,15 +0,0 @@
-# theme default settings (non-style settings)
-
-INCLUDE header
-
-PROMPT 0
-NOESCAPE 1
-TIMEOUT 60
-TOTALTIMEOUT 3000
-
-#MENU MASTER PASSWD secret
-MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben:
-MENU AUTOBOOT Auswahl startet in # Sekunden
-
-MENU TITLE OpenSLX - Hauptmenü
-
diff --git a/boot-env/pxe/themes/openslx/header b/boot-env/pxe/themes/openslx/header
deleted file mode 100644
index 98de4e6f..00000000
--- a/boot-env/pxe/themes/openslx/header
+++ /dev/null
@@ -1,39 +0,0 @@
-# theme style definition
-
-DEFAULT vesamenu.c32
-MENU BACKGROUND openslx.png
-
-MENU WIDTH 78
-MENU MARGIN 9
-MENU PASSWORDMARGIN 9
-MENU ROWS 12
-MENU TABMSGROW 18
-MENU CMDLINEROW 18
-MENU ENDROW -1
-MENU PASSWORDROW 18
-MENU TIMEOUTROW 18
-MENU HELPMSGROW 18
-MENU HELPMSGENDROW -1
-MENU HSHIFT 0
-MENU VSHIFT 5
-
-menu color screen 37;40 #80ffffff #00000000 std
-menu color border 37;40 #40000000 #ff8093a1 std
-menu color title 1;37;40 #ffff8b00 #ff8093a1 std
-menu color unsel 37;40 #fff0f0f0 #ff8093a1 std
-menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std
-menu color sel 7;37;40 #ff1c2a33 #667799bb all
-menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all
-menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std
-menu color scrollbar 37;40 #40000000 #ee000000 std
-menu color tabmsg 37;40 #ffff8b00 #ff8093a1 std
-menu color cmdmark 1;37;40 #ffff8b00 #ff8093a1 std
-menu color cmdline 37;40 #fff0f0f0 #ff8093a1 std
-menu color pwdborder 37;40 #40000000 #ff8093a1 std
-menu color pwdheader 37;40 #ffff8b00 #ff8093a1 std
-menu color pwdentry 37;40 #ffff8b00 #ff8093a1 std
-menu color timeout_msg 37;40 #ff1c2a33 #00000000 none
-menu color timeout 1;37;40 #ffff8b00 #00000000 std
-menu color help 37;40 #ff1c2a33 #00000000 none
-menu color msg07 37;40 #90ffffff #00000000 std
-
diff --git a/boot-env/pxe/themes/openslx/theme.conf b/boot-env/pxe/themes/openslx/theme.conf
index 16fcc6a8..159adf78 100644
--- a/boot-env/pxe/themes/openslx/theme.conf
+++ b/boot-env/pxe/themes/openslx/theme.conf
@@ -1,13 +1,12 @@
-DEFAULT vesamenu.c32
-MENU BACKGROUND openslx.png
+# openslx theme style definition
+# please define only look of your theme
+# for non-theme definitions use slxsettings
+# or include file in /etc/opt/openslx/boot-env/pxe/menu-include
 
-PROMPT 0
-NOESCAPE 1
-TIMEOUT 100
-TOTALTIMEOUT 3000
+MENU BACKGROUND openslx.png
 MENU WIDTH 78
-MENU MARGIN @@@MENU_MARGIN@@@
-MENU PASSWORDMARGIN @@@MENU_MARGIN@@@
+MENU MARGIN 9
+MENU PASSWORDMARGIN 9
 MENU ROWS 12
 MENU TABMSGROW 18
 MENU CMDLINEROW 18
@@ -26,6 +25,7 @@ menu color unsel 37;40 #fff0f0f0 #ff8093a1 std
 menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std
 menu color sel 7;37;40 #ff1c2a33 #667799bb all
 menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all
+menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std
 menu color scrollbar 37;40 #40000000 #ee000000 std
 menu color tabmsg 37;40 #ffff8b00 #ff8093a1 std
 menu color cmdmark 1;37;40 #ffff8b00 #ff8093a1 std
@@ -38,35 +38,3 @@ menu color timeout 1;37;40 #ffff8b00 #00000000 std
 menu color help 37;40 #ff1c2a33 #00000000 none
 menu color msg07 37;40 #90ffffff #00000000 std
 
-MENU MASTER PASSWD secret
-MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben:
-MENU AUTOBOOT Auswahl startet in # Sekunden
-
-MENU TITLE OpenSLX - Hauptmenü
-
-#####
-LABEL Bitte wählen Sie über die Pfeiltasten aus:
-    KERNEL vesamenu.c32
-    APPEND pxelinux.cfg/default
-
-LABEL @@@SEPARATOR_LINE@@@
-    KERNEL vesamenu.c32
-    APPEND pxelinux.cfg/default
-#####
-
-@@@SLX_LABELS@@@
-
-#####
-LABEL @@@SEPARATOR_LINE@@@
-    KERNEL vesamenu.c32
-    APPEND pxelinux.cfg/default
-#####
-
-LABEL hilfe
-    MENU LABEL ^Hilfe
-    TEXT HELP
-         Bitte wählen Sie das gewünschte System über die Pfeiltasten
-         und bestätigen Sie mit der Return-Taste.
-    ENDTEXT
-    KERNEL vesamenu.c32
-    APPEND pxelinux.cfg/default