Updated CD boot menu ...

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

4 files changed, 16 insertions, 10 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
index f6afbcba..e6c7e3cc 100644
--- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
@@ -59,14 +59,19 @@ sub _createImage
 
     # write trivial isolinux config
     my $isolinuxConfig = unshiftHereDoc(<<"    End-of-Here");
-        PROMPT 1
+        PROMPT 0
         TIMEOUT 100
         DEFAULT OpenSLX
+        MENU TITLE Welcome to OpenSLX PreBoot CD
 
         LABEL OpenSLX
+          MENU LABEL OpenSLX PreBoot
           SAY Now loading OpenSLX preboot environment ...
           KERNEL vmlinuz
           APPEND initrd=initramfs debug=3 vga=0x317
+          TEXT HELP
+                 Your chance to edit the kernel commandline ...
+          ENDTEXT
     End-of-Here
     spitFile("$imageDir/iso/isolinux/isolinux.cfg", $isolinuxConfig);
 
diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh
index 4a05847f..795522c8 100755
--- a/boot-env/preboot/preboot.sh
+++ b/boot-env/preboot/preboot.sh
@@ -48,7 +48,8 @@ chvt 1
 wget -O /tmp/kernel $boot_uri/$kernel
 wget -O /tmp/initramfs $boot_uri/$initramfs
 
-# read primary IP configuration to pass it on
+# read primary IP configuration to pass it on (behaviour like IPAPPEND=1 of
+# PXElinux)
 . /tmp/ipstuff
 
 clear
diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages
index 3682384d..918524b6 100644
--- a/initramfs/stage3-stuff/etc/messages
+++ b/initramfs/stage3-stuff/etc/messages
@@ -10,8 +10,8 @@
 # General information about OpenSLX can be found at http://openslx.org
 #
 # Messages file for all error and info messages generated during client
-# bootup (within initialramfs) for OpenSLX linux diskless clients version 5
-# this file could be used for localization of error messages 
+# bootup (within initialramfs) for OpenSLX linux diskless clients version 5.
+# Fhis file contains the standard set of error messages.
 
 # messages from (slx) init
 init_errmsg="The functions file contains a lot of slx scripts \
@@ -142,9 +142,8 @@ error_errlcfg="  Did not get any configuration data via ldap until now ..."
 unpack_ConfTGZ="  Error during unpacking of the ConfTGZ archive.\nAre you sure \
 it is in proper format?"
 nomachsetup="  No machine-setup file found. You might not have gotten any \
-configuration\n  from your server. Your slx client will not work properly. \
-Please check that /initramfs and /rootfs are present!"
-
+configuration\n  from your server. You could find that out by checking if \
+/initramfs and\n  /rootfs are present!"
 
 # messages from distro functions
 df_errumod="    Failed to load the \"unix\" module. Problems with Hardware \
diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de
index 1651b595..6fd2dd46 100644
--- a/initramfs/stage3-stuff/etc/messages.de
+++ b/initramfs/stage3-stuff/etc/messages.de
@@ -11,7 +11,7 @@
 #
 # Messages file for all error and info messages generated during client
 # bootup (within initialramfs) for OpenSLX linux diskless clients version 5
-# this file could be used for localization of error messages 
+# this file could be used for localization of error messages.
 
 # messages from (slx) init / Fehlermeldungen des SLX init
 init_errmsg="  ,,functions''-Datei beinhaltet viele Funktionen \
@@ -150,8 +150,9 @@ error_errlcfg="  Bis jetzt noch keine Konfigurationsdaten bekommen via ldap ..."
 unpack_ConfTGZ="  Fehler beim entpacken des ConfTGZ.\nSind Sie sicher, dass es im \
 richtigen Format ist?"
 nomachsetup="  Die Datei machine-setup nicht gefunden. Es koennte sein, dass das \
-Konfigurations-\n  paket nicht erfolgreich vom Server beschafft wurde. Ihr \
-OpenSLX Client\n  wird deshalb nicht wie erwartet funktionieren."
+Konfigurations-\n  paket nicht erfolgreich vom Server beschafft wurde. Das \
+erkennen Sie daran,\n  dass die Verzeichnisse /initramfs, /rootfs angelegt \
+wurden. Ihr\n  OpenSLX Client wird deshalb nicht wie erwartet funktionieren."
 
 # messages from distro functions
 df_errumod="    Das Laden des \"unix\" Moduls schlug fehl. \nWahrscheinlich \