diff options
| author | Jonathan Bauer | 2015-09-11 14:40:06 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-11 14:40:06 +0200 |
| commit | 983a6e2b63bdc8e97c556332b2be9d0c2e3ffd41 (patch) | |
| tree | b7766721c0933e702c39615e464060edfe0bc159 /dozentenmodul/src/main/java/org/openslx | |
| parent | [client] removed listenToChange() and run its code directly in the constructor (diff) | |
| parent | [server] Change name of redo log dir placeholder (diff) | |
| download | tutor-module-983a6e2b63bdc8e97c556332b2be9d0c2e3ffd41.tar.gz tutor-module-983a6e2b63bdc8e97c556332b2be9d0c2e3ffd41.tar.xz tutor-module-983a6e2b63bdc8e97c556332b2be9d0c2e3ffd41.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java index 36c64fdf..2a192171 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java @@ -38,7 +38,7 @@ public class VmWrapper { machineDescription.length); } // Append disk & NAT - if (!vmwareConfig.addDefaultNat() || !vmwareConfig.addHddTemplate(diskFile.getName())) { + if (!vmwareConfig.addDefaultNat() || !vmwareConfig.addHddTemplate(diskFile.getName(), null, null)) { throw new MetaDataMissingException(); } // The guestOS should be in the vmx, but the user could have changed it by editing |