summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDirk2013-01-28 22:19:13 +0100
committerDirk2013-01-28 22:19:13 +0100
commit1d989a91d6ffe1df39da372acfcc9c4569f749f3 (patch)
tree099b864c482c7dc1b787fa27d1e8dd03c22dd884 /src
parentadd possibility to sync only config files from <priv>/config/stage1 w/o the n... (diff)
downloadcore-1d989a91d6ffe1df39da372acfcc9c4569f749f3.tar.gz
core-1d989a91d6ffe1df39da372acfcc9c4569f749f3.tar.xz
core-1d989a91d6ffe1df39da372acfcc9c4569f749f3.zip
VirtBox cannot run VMDKs in the way used here ...
Diffstat (limited to 'src')
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm9
-rw-r--r--src/os-plugins/plugins/virtualbox/files/run-virt.include6
2 files changed, 6 insertions, 9 deletions
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