diff options
| author | Jonathan Bauer | 2014-04-15 16:45:59 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-04-15 16:45:59 +0200 |
| commit | 6ebefac2233f351269f37716aa92d460ae2032a8 (patch) | |
| tree | 79410d3c1829ad4eb04668287a4c33ad8785d94c | |
| parent | [systemd] revert to version 204 for ubuntu 14.x (diff) | |
| parent | [vbox] Some additions and fixes for VirtualBox - please test! (diff) | |
| download | tm-scripts-6ebefac2233f351269f37716aa92d460ae2032a8.tar.gz tm-scripts-6ebefac2233f351269f37716aa92d460ae2032a8.tar.xz tm-scripts-6ebefac2233f351269f37716aa92d460ae2032a8.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include | 2 | ||||
| -rw-r--r-- | remote/modules/vbox/module.conf.ubuntu.13.10 | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include index 1a87e01b..22c62513 100755 --- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include +++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include @@ -179,7 +179,7 @@ machineuuid="00000000-0000-0000-0000-${macaddr}" machineuuid=$(echo ${machineuuid} | tr "[A-Z]" "[a-z]") # get UUID of VBox image, if not diskless [ ${diskless} -eq 0 ] && diskuuid=$(VBoxManage -q showvdiinfo ${diskfile} \ - | grep UUID | awk '{print $2}') + | grep UUID | grep -v "Parent UUID" | awk '{print $2}') # make disk immutable imgtype="Immutable" # snapshot UUID is static diff --git a/remote/modules/vbox/module.conf.ubuntu.13.10 b/remote/modules/vbox/module.conf.ubuntu.13.10 new file mode 100644 index 00000000..463c26e2 --- /dev/null +++ b/remote/modules/vbox/module.conf.ubuntu.13.10 @@ -0,0 +1,24 @@ +REQUIRED_VBOX_VERSION_MAJOR="4.3" +REQUIRED_VBOX_VERSION_MINOR="8" +REQUIRED_VBOX_VERSION="$REQUIRED_VBOX_VERSION_MAJOR.$REQUIRED_VBOX_VERSION_MINOR" +REQUIRED_VBOX_VERSIONCODE="92456" +REQUIRED_VBOX_OSCODE='Ubuntu~raring' + +REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb" + +REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack" + + +REQUIRED_CONTENT_PACKAGES=" + libsdl1.2debian + libpng12-0 +" + +REQUIRED_INSTALLED_PACKAGES=" + libsdl1.2debian + libpng12-0 +" + +REQUIRED_LIBRARIES=" + libpng12 +" |