diff options
| author | root | 2010-04-13 15:49:09 +0200 |
|---|---|---|
| committer | root | 2010-04-13 15:49:09 +0200 |
| commit | 91c3a8df4be49fba4c7398413e15fc9868b94bd0 (patch) | |
| tree | 7305f330b58eed9a0d9bd01b20ca0efbe8b4f23d /boot-env/OpenSLX/BootEnvironment | |
| parent | fix pbs stuff (diff) | |
| parent | virtualization plugin, now with calculation of mem, run-vmgrid and run-virt u... (diff) | |
| download | core-91c3a8df4be49fba4c7398413e15fc9868b94bd0.tar.gz core-91c3a8df4be49fba4c7398413e15fc9868b94bd0.tar.xz core-91c3a8df4be49fba4c7398413e15fc9868b94bd0.zip | |
Merge branch 'master' of git@openslx.org:openslx/core
Diffstat (limited to 'boot-env/OpenSLX/BootEnvironment')
| -rw-r--r-- | boot-env/OpenSLX/BootEnvironment/PXE.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm index 06df1361..d46786d0 100644 --- a/boot-env/OpenSLX/BootEnvironment/PXE.pm +++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm @@ -79,13 +79,16 @@ sub writeBootloaderMenuFor $label = $info->{name}; } } - $info->{pxeLabel} = $label; + $info->{menuLabel} = $label; } +# if kernel=*xen* then run sub _xenLabel from xen.pm my $slxLabels = ''; foreach my $info (sort { $a->{label} cmp $b->{label} } @$systemInfos) { my $vendorOSName = $info->{'vendor-os'}->{name}; my $kernelName = basename($info->{'kernel-file'}); my $append = $info->{attrs}->{kernel_params}; + my $pxeLabel = $info->{'external-id'}; + $pxeLabel =~ s/::/-/g; my $pxePrefix = ''; my $tftpPrefix = ''; $info->{'pxe_prefix_ip'} ||= ''; @@ -110,12 +113,14 @@ sub writeBootloaderMenuFor $append .= " file=$bootURI" if length($bootURI); $append .= " file=$tftpPrefix" if length($tftpPrefix); $append .= " $clientAppend"; - $slxLabels .= "LABEL openslx-$info->{'external-id'}\n"; + $slxLabels .= "LABEL openslx-$pxeLabel\n"; $slxLabels .= $pxeDefault; - $slxLabels .= "\tMENU LABEL ^$info->{pxeLabel}\n"; + $slxLabels .= "\tMENU LABEL ^$info->{menuLabel}\n"; $slxLabels .= "\tKERNEL $pxePrefix$vendorOSName/$kernelName\n"; $slxLabels .= "\tAPPEND $append\n"; $slxLabels .= "\tIPAPPEND 3\n"; +# if kernel=*xen* then run sub _xenBootEntry from xen.pm +# if (!defined $xenKernel) {...} my $helpText = $info->{description} || ''; if (length($helpText)) { # make sure that text matches the given margin |