From 1d989a91d6ffe1df39da372acfcc9c4569f749f3 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Mon, 28 Jan 2013 22:19:13 +0100
Subject: VirtBox cannot run VMDKs in the way used here ...

---
 src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm      | 9 +++------
 src/os-plugins/plugins/virtualbox/files/run-virt.include | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
index de56ee20..7a556eb0 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
@@ -59,15 +59,12 @@ sub determineMatchingHwinfoVersion
 
     # Please check, if correct
     my %versionMap = (
-        '7.10' => '14.19',
-        '8.04' => '15.3',
-        '8.10' => '15.21',
-        '9.04' => '15.21',
-        '9.10' => '16.0',
         '10.04' => '16.0',
 	'10.10' => '16.0',
 	'11.04' => '16.0',
-	'11.10' => '16.0'
+	'11.10' => '16.0',
+	'12.04' => '16.0',
+	'12.10' => '16.0',
     );
     return $versionMap{$distroVersion}
         || $self->SUPER::determineMatchingHwinfoVersion($distroVersion);
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index cd5329a1..3e35af89 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -1,7 +1,7 @@
 # run-virt.include
 # -----------------------------------------------------------------------------
 # Copyright (c) 2009..2011 - RZ Uni Freiburg
-# Copyright (c) 2009..2012 - OpenSLX GmbH
+# Copyright (c) 2009..2013 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -74,10 +74,10 @@ diskfile="${diskfolder}/${imgname}"
 [ ${diskless} -eq 0 ] && ln -sf ${vmpath} ${diskfile}
 
 # check the file type
-if echo ${imgname} | grep -qiE "vdi|vmdk|vhd" && [ ${diskless} -eq 0 ]; then
+if echo ${imgname} | grep -qiE "vdi|vhd" && [ ${diskless} -eq 0 ]; then
   imgfmt=$(echo ${imgname##*.} | tr "[a-z]" "[A-Z]")
 elif [ ${diskless} -eq 0 ]; then
-  writelog "${imgname} is not a valid image format (vdi|vmdk|vhd), exiting!"
+  writelog "${imgname} is not a valid image format (vdi|vhd), exiting!"
   cleanexit 1
 fi
 
-- 
cgit v1.2.3-55-g7522