diff options
| author | Dirk von Suchodoletz | 2009-06-03 21:13:40 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-06-03 21:13:40 +0200 |
| commit | c9f349e0d98007f114766d756709d0a0cd8d7450 (patch) | |
| tree | 29545f0f2439b8266c2528d468e1645818b6cb25 /boot-env | |
| parent | Redirection of kernel (debug) output ... (see [[DebugLevel]] in the project w... (diff) | |
| download | core-c9f349e0d98007f114766d756709d0a0cd8d7450.tar.gz core-c9f349e0d98007f114766d756709d0a0cd8d7450.tar.xz core-c9f349e0d98007f114766d756709d0a0cd8d7450.zip | |
Minor updates for PreBoot ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2927 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'boot-env')
| -rw-r--r-- | boot-env/OpenSLX/BootEnvironment/PrebootCD.pm | 1 | ||||
| -rwxr-xr-x | boot-env/preboot/preboot.sh | 6 | ||||
| -rwxr-xr-x | boot-env/preboot/uclib-rootfs/init | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm index 7ea4d9e1..cd99de09 100644 --- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm +++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm @@ -74,6 +74,7 @@ sub _createImage TAB key (e.g. for adding debug=3 to it for bug hunting) ... ENDTEXT LABEL LOCALBOOT + MENU LABEL Boot locally (skip OpenSLX PreBoot) ... LOCALBOOT -1 TEXT HELP Gets you out of here by booting from next device in BIOS boot diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh index f682f067..3eac7a08 100755 --- a/boot-env/preboot/preboot.sh +++ b/boot-env/preboot/preboot.sh @@ -19,8 +19,8 @@ client=$(echo 01-$macaddr|sed "s/:/-/g") # check if already a configuration is available to decide if user interaction -# is required -# wget -O /tmp/cfg-error $boot_uri/${client} +# is required (path is to be fixed) +wget -O /tmp/cfg-error $boot_uri/genconfig/${client} # Switch here for several boot TYPE=fastboot/directkiosk/cfgkiosk/slxconfig # fastboot - no interaction use system from client config @@ -81,4 +81,4 @@ wget -q -O /tmp/initramfs $boot_uri/$initramfs dialog --infobox "Booting OpenSLX client $label ..." 3 65 kexec -l /tmp/kernel --initrd=/tmp/initramfs \ --append="$append file=$boot_uri/${preboot_id}/client-config/${sysname}/${client}.tgz $quiet ip=$ip:$siaddr:$router:$subnet:$dnssrv $debug" 2>/dev/null -kexec -e +kexec -e >/dev/null 2>&1 diff --git a/boot-env/preboot/uclib-rootfs/init b/boot-env/preboot/uclib-rootfs/init index cb893d44..ed2c22ae 100755 --- a/boot-env/preboot/uclib-rootfs/init +++ b/boot-env/preboot/uclib-rootfs/init @@ -174,7 +174,7 @@ echo "macaddr=$macaddr" >>/etc/initramfs-setup # user choose what kind of SLX client he wants to get dialog --infobox "Fetching preboot interactive part and configuration from \ the net ($boot_uri) ..." 4 65 -wget -q -c -O /tmp/preboot.env $boot_uri/bootloader/${preboot_id}.env +wget -q -O /tmp/preboot.env $boot_uri/bootloader/${preboot_id}.env mkdir /preboot tar -xzf /tmp/preboot.env -C /preboot # start a debug shell if needed, else set quiet kernel parameter |