diff options
| author | root | 2010-04-13 15:48:45 +0200 |
|---|---|---|
| committer | root | 2010-04-13 15:48:45 +0200 |
| commit | b7077b4c2275ad23e5eedecbd7249913061bac95 (patch) | |
| tree | 270d43e49da1b965279728439bc26222d0f14d27 /boot-env | |
| parent | add trim to utils (diff) | |
| download | core-b7077b4c2275ad23e5eedecbd7249913061bac95.tar.gz core-b7077b4c2275ad23e5eedecbd7249913061bac95.tar.xz core-b7077b4c2275ad23e5eedecbd7249913061bac95.zip | |
fix pbs stuff
Diffstat (limited to 'boot-env')
| -rw-r--r-- | boot-env/OpenSLX/BootEnvironment/PBS.pm | 8 | ||||
| -rw-r--r-- | boot-env/OpenSLX/BootEnvironment/PXE.pm | 10 | ||||
| -rwxr-xr-x | boot-env/pbs/uclib-rootfs/init | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/PBS.pm b/boot-env/OpenSLX/BootEnvironment/PBS.pm index 2e7ef706..2072884b 100644 --- a/boot-env/OpenSLX/BootEnvironment/PBS.pm +++ b/boot-env/OpenSLX/BootEnvironment/PBS.pm @@ -92,12 +92,12 @@ sub writeBootloaderMenuFor 'systems' => $systemInfos }); my $ua = LWP::UserAgent->new; - my $res = $ua->request(POST 'http://pbs.lan/backend/system/sync', [data => $data_json]); + my $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/sync', [data => $data_json]); if ($res->is_success) { my $resData = from_json($res->content); if ($resData->{'getKernel'} eq 'fresh') { - $res = $ua->request(POST 'http://pbs.lan/backend/system/addkernel', + $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/addkernel', ['kernel' => basename($prebootSystemInfo->{'kernel-file'}), 'kernelFile' => ["$self->{'target-path'}/imagebase/vmlinuz"], 'initramfsFile' => ["$self->{'target-path'}/imagebase/initramfs"], @@ -109,7 +109,7 @@ sub writeBootloaderMenuFor } else { if ($resData->{'getKernel'} eq 'update') { - $res = $ua->request(POST 'http://pbs.lan/backend/system/updatekernel', + $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/updatekernel', ['kernel' => basename($prebootSystemInfo->{'kernel-file'}), 'kernelFile' => ["$self->{'target-path'}/imagebase/vmlinuz"], ], @@ -121,7 +121,7 @@ sub writeBootloaderMenuFor # do nothing } if ($resData->{'getInitramfs'} eq 'update') { - $res = $ua->request(POST 'http://pbs.lan/backend/system/updateinitramfs', + $res = $ua->request(POST 'http://pbs.experimental.openslx.org/backend/system/updateinitramfs', ['kernel' => basename($prebootSystemInfo->{'kernel-file'}), 'initramfsFile' => ["$self->{'target-path'}/imagebase/initramfs"], ], diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm index 8387219d..06df1361 100644 --- a/boot-env/OpenSLX/BootEnvironment/PXE.pm +++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm @@ -99,11 +99,13 @@ sub writeBootloaderMenuFor # set default menu entry my $pxeDefault = ""; - if ($openslxConfig{'pxe-default-menu-entry'} eq $info->{'external-id'}) - { - $pxeDefault = "\tMENU DEFAULT\n"; + if (defined $openslxConfig{'pxe-default-menu-entry'}) { + if ($openslxConfig{'pxe-default-menu-entry'} eq + $info->{'external-id'}) + { + $pxeDefault = "\tMENU DEFAULT\n"; + } } - $append .= " initrd=$pxePrefix$vendorOSName/$info->{'initramfs-name'}"; $append .= " file=$bootURI" if length($bootURI); $append .= " file=$tftpPrefix" if length($tftpPrefix); diff --git a/boot-env/pbs/uclib-rootfs/init b/boot-env/pbs/uclib-rootfs/init index 67427127..3c992070 100755 --- a/boot-env/pbs/uclib-rootfs/init +++ b/boot-env/pbs/uclib-rootfs/init @@ -177,7 +177,6 @@ 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 -echo -e "192.168.2.100\t pbs.lan" > /etc/hosts mkdir -p /preboot wget -q -O /preboot/preboot.init ${boot_uri}bootloader/env/getinit/formedia/$PBS_ID chmod u+x /preboot/preboot.init |