diff options
Diffstat (limited to 'boot-env')
-rw-r--r-- | boot-env/OpenSLX/BootEnvironment/PrebootCD.pm | 31 | ||||
-rwxr-xr-x | boot-env/preboot/http-server/user_settings.pl | 5 | ||||
-rwxr-xr-x | boot-env/preboot/preboot.sh | 9 |
3 files changed, 13 insertions, 32 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); diff --git a/boot-env/preboot/http-server/user_settings.pl b/boot-env/preboot/http-server/user_settings.pl index 01d53afe..edbd0523 100755 --- a/boot-env/preboot/http-server/user_settings.pl +++ b/boot-env/preboot/http-server/user_settings.pl @@ -86,9 +86,10 @@ if ($type ne "fastboot") { rmtree($destPath."/".$client); } +# resulting page is not shown to the user (error reporting that way, or +# completely empty reply?) print $cgi->header(-charset => 'iso8859-1'), - $cgi->start_html('Hey there ...'), - $cgi->h1('Yo!'), + $cgi->start_html('...'), $cgi->p("Error: $errormsg"), $cgi->end_html(); diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh index 58112306..340a01c2 100755 --- a/boot-env/preboot/preboot.sh +++ b/boot-env/preboot/preboot.sh @@ -50,10 +50,11 @@ fi # bring the mac address into the standard format 01-<MAC> client=$(echo 01-$macaddr|sed "s/:/-/g") -chvt 4 -w3m -o confirm_qq=no \ - "$boot_uri/cgi-bin/user_settings.pl?system=${sysname}&preboot_id=${preboot_id}&client=${client}" -chvt 1 +# to be replaced by wget --post ... +#chvt 4 +#w3m -o confirm_qq=no \ +# "$boot_uri/cgi-bin/user_settings.pl?system=${sysname}&preboot_id=${preboot_id}#&client=${client}" +#chvt 1 # fetch kernel and initramfs of selected system wget -O /tmp/kernel $boot_uri/$kernel | dialog --progressbox 3 65 |