Merge branch 'master' of git@openslx.org:openslx/core

4 files changed, 27 insertions, 7 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
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
index c664c1ba..1628c5f1 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
@@ -52,6 +52,7 @@ sub determineMatchingHwinfoVersion
         '10.3' => '14.19',
         '11.0' => '15.3',
         '11.1' => '15.21',
+        '11.2' => '15.21'
     );
     return $versionMap{$distroVersion}
         || $self->SUPER::determineMatchingHwinfoVersion($distroVersion);
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
index 9240f5b5..64c20538 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006..2009 - OpenSLX GmbH
+  # Copyright (c) 2006..2009 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -54,6 +54,8 @@ sub determineMatchingHwinfoVersion
         '8.04' => '15.3',
         '8.10' => '15.21',
         '9.04' => '15.21',
+        '9.10' => '15.21',
+        '10.04' => '15.21',
     );
     return $versionMap{$distroVersion}
         || $self->SUPER::determineMatchingHwinfoVersion($distroVersion);
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
index a4a984e9..6de0a4fe 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
@@ -240,6 +240,10 @@ sub _copyKernelModules
     push @kernelModules, split ' ', $self->{attrs}->{ramfs_miscmods};
     push @kernelModules, split ' ', $self->{attrs}->{ramfs_nicmods};
 
+    if ($self->{attrs}->{ramfs_nicmods} =~ m{virtio}i) {
+        push @kernelModules, qw( virtio_pci virtio_net );
+    }
+
     # a function that determines dependent modules recursively
     my $addDependentsSub;
     $addDependentsSub = sub {
@@ -379,13 +383,21 @@ sub _writeSlxSystemConf
     # check if default directories available and copy them to /etc
     my $defaultDirConfig = "$self->{'root-path'}/etc/opt/openslx/openslx.conf";
     my $configTargetPath = "$self->{'build-path'}/etc";
-    
+    #my $defaultConfVer   = slurpFile("$defaultDirConfig");
+    #my $actConfVer       = "Version 0.2";
+
     if (-r $defaultDirConfig) {
         $self->addCMD("cp -p $defaultDirConfig $configTargetPath/");
+#        if ($defaultConfVer =~ m{$actConfVer}) {
+#            warn _tr(
+#                "Your version of default dir file (openslx.conf) is to old!\n".
+#                "Eventually the system won't work.\n" .
+#                "Please run install, update or clone of this system again!\n");
+#        }
     } else {
         die _tr(
-           "No default directories defined!\n" .
-           "Please run install, update or clone of this system again!\n");
+            "No default directories defined!\n" .
+            "Please run install, update or clone of this system again!\n");
     }
 
     return;