diff options
| author | Dirk von Suchodoletz | 2009-06-03 16:33:58 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-06-03 16:33:58 +0200 |
| commit | 65f5bac22704d8739a6dc48fe9610bf0e2703758 (patch) | |
| tree | b4d08a3e5ea4c0b20cc1785d531a5255418757f1 | |
| parent | * different modification, including hostsystem and network (diff) | |
| download | core-65f5bac22704d8739a6dc48fe9610bf0e2703758.tar.gz core-65f5bac22704d8739a6dc48fe9610bf0e2703758.tar.xz core-65f5bac22704d8739a6dc48fe9610bf0e2703758.zip | |
Next gen preboot ...
Updated isolinux.bin of HPA.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2919 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | boot-env/preboot/cd/iso/isolinux/isolinux.bin | bin | 14336 -> 14336 bytes | |||
| -rwxr-xr-x | boot-env/preboot/http-server/user_settings.pl | 6 | ||||
| -rwxr-xr-x | boot-env/preboot/preboot.sh | 17 |
3 files changed, 14 insertions, 9 deletions
diff --git a/boot-env/preboot/cd/iso/isolinux/isolinux.bin b/boot-env/preboot/cd/iso/isolinux/isolinux.bin Binary files differindex 72d20b76..ba735e41 100644 --- a/boot-env/preboot/cd/iso/isolinux/isolinux.bin +++ b/boot-env/preboot/cd/iso/isolinux/isolinux.bin diff --git a/boot-env/preboot/http-server/user_settings.pl b/boot-env/preboot/http-server/user_settings.pl index edbd0523..6c135267 100755 --- a/boot-env/preboot/http-server/user_settings.pl +++ b/boot-env/preboot/http-server/user_settings.pl @@ -90,6 +90,8 @@ if ($type ne "fastboot") { # completely empty reply?) print $cgi->header(-charset => 'iso8859-1'), - $cgi->start_html('...'), - $cgi->p("Error: $errormsg"), + $cgi->start_html('...'); +if ($errormsg) { print $cgi->p("Error: $errormsg"); } +print $cgi->end_html(); + diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh index 340a01c2..dd7cd256 100755 --- a/boot-env/preboot/preboot.sh +++ b/boot-env/preboot/preboot.sh @@ -51,14 +51,17 @@ fi # bring the mac address into the standard format 01-<MAC> client=$(echo 01-$macaddr|sed "s/:/-/g") # 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 +wget --post-data "?system=${sysname}&preboot_id=${preboot_id}&client=${client}" \ + $boot_uri/cgi-bin/user_settings.pl -O /tmp/cfg-error -# fetch kernel and initramfs of selected system -wget -O /tmp/kernel $boot_uri/$kernel | dialog --progressbox 3 65 -wget -O /tmp/initramfs $boot_uri/$initramfs | dialog --progressbox 3 65 +[ "x$DEBUGLEVEL" != x0 -a grep -qe "Error:" /tmp/cfg-error 2>/dev/null ] && \ + dialog --msgbox "An error occured ..." # to be elaborated + +# fetch kernel and initramfs of selected system +dialog --infobox "Loading kernel of ${sysname} ..." 3 65 +wget -q -O /tmp/kernel $boot_uri/$kernel +dialog --infobox "Loading initial ramfs of ${sysname} ..." 3 65 +wget -O /tmp/initramfs $boot_uri/$initramfs # read primary IP configuration to pass it on (behaviour like IPAPPEND=1 of # PXElinux) |