summaryrefslogtreecommitdiffstats
path: root/boot-env/OpenSLX/BootEnvironment/PXE.pm
diff options
context:
space:
mode:
authorMichael Janczyk2010-02-26 21:04:36 +0100
committerMichael Janczyk2010-02-26 21:04:36 +0100
commit4ebf2c15e4aa929dc931e10a3905985a9996fff5 (patch)
tree6801a36f2aabc45ed5540e87c38072803758f073 /boot-env/OpenSLX/BootEnvironment/PXE.pm
parentAdding stage3 functions file for Ubuntu 10.04 (stub, still empty) (diff)
downloadcore-4ebf2c15e4aa929dc931e10a3905985a9996fff5.tar.gz
core-4ebf2c15e4aa929dc931e10a3905985a9996fff5.tar.xz
core-4ebf2c15e4aa929dc931e10a3905985a9996fff5.zip
changed PXE LABEL: replace :: to - in LABEL statement
Diffstat (limited to 'boot-env/OpenSLX/BootEnvironment/PXE.pm')
-rw-r--r--boot-env/OpenSLX/BootEnvironment/PXE.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm
index 06df1361..e49e52b6 100644
--- a/boot-env/OpenSLX/BootEnvironment/PXE.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm
@@ -79,13 +79,15 @@ sub writeBootloaderMenuFor
$label = $info->{name};
}
}
- $info->{pxeLabel} = $label;
+ $info->{menuLabel} = $label;
}
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,9 +112,10 @@ 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";