Changes to PreBoot as discussed (removing selection part from isolinux

as it is too unflexible); no user interaction via w3m/http ...


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

1 files changed, 5 insertions, 26 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
index aaa42bf5..7ea4d9e1 100644
--- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
@@ -64,7 +64,7 @@ sub _createImage
         DEFAULT menu.c32
         MENU TITLE Welcome to OpenSLX PreBoot ISO/CD (Mini Linux/Kexec)
         LABEL SLXSTDBOOT
-          MENU LABEL OpenSLX PreBoot - Direct Boot / Direct Start
+          MENU LABEL OpenSLX PreBoot - Stateless Netboot Linux ...
           MENU DEFAULT
           KERNEL vmlinuz
           APPEND initrd=initramfs vga=0x317
@@ -73,32 +73,11 @@ sub _createImage
                  You have chance to edit the kernel commandline by hitting the
                  TAB key (e.g. for adding debug=3 to it for bug hunting) ...
           ENDTEXT
-        LABEL SLXKIOSKBOOT
-          MENU LABEL OpenSLX PreBoot - Kiosk / Direct Start
-          KERNEL vmlinuz
-          APPEND initrd=initramfs vga=0x317 type=directkiosk
-          TEXT HELP
-                 Use this entry if you would like to start your machine into
-                 the standard SLX kiosk. At the same time you have the chance
-                 to edit the kernel commandline by hitting the TAB key ...
-          ENDTEXT
-        LABEL SLXCFGBOOT
-          MENU LABEL OpenSLX PreBoot - Client Configuration Interface
-          KERNEL vmlinuz
-          APPEND initrd=initramfs vga=0x317 type=slxconfig
-          TEXT HELP
-                 Use this entry if you would like to configure/modify your
-                 SLX client.  At the same time you have the chance to edit 
-                 the kernel commandline by hitting the TAB key ...
-          ENDTEXT
-        LABEL SLXCFGKIOSK
-          MENU LABEL OpenSLX PreBoot - Kiosk Configuration Interface
-          KERNEL vmlinuz
-          APPEND initrd=initramfs vga=0x317 type=cfgkiosk
+        LABEL LOCALBOOT
+          LOCALBOOT -1
           TEXT HELP
-                 Use this entry if you would like to configure / modify your
-                 OpenSLX kiosk. At the same time you have the chance to edit 
-                 the kernel commandline by hitting the TAB key ...
+                 Gets you out of here by booting from next device in BIOS boot
+                 order.
           ENDTEXT
     End-of-Here
     spitFile("$imageDir/iso/isolinux/isolinux.cfg", $isolinuxConfig);