cumulative commit of local branch, many changes regarding virtualization

2 files changed, 14 insertions, 4 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm
index e49e52b6..d46786d0 100644
--- a/boot-env/OpenSLX/BootEnvironment/PXE.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm
@@ -81,6 +81,7 @@ sub writeBootloaderMenuFor
         }
         $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};
@@ -112,13 +113,14 @@ sub writeBootloaderMenuFor
         $append .= " file=$bootURI"     if length($bootURI);
         $append .= " file=$tftpPrefix"  if length($tftpPrefix);
         $append .= " $clientAppend";
-        
         $slxLabels .= "LABEL openslx-$pxeLabel\n";
         $slxLabels .= $pxeDefault;
         $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/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
index ca4764ca..cac92b37 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
@@ -383,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;