diff options
| author | Jonathan Bauer | 2018-04-16 10:11:59 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2018-04-16 10:11:59 +0200 |
| commit | 2a1f6f05e3ed8384e84dd7f464de82ba3fb899d8 (patch) | |
| tree | 3ed329eee61cf8fa1c053a4998568bcba4d316e2 /core/modules/vbox-src/data | |
| parent | [vbox-src] better cpu flag detection (diff) | |
| download | mltk-2a1f6f05e3ed8384e84dd7f464de82ba3fb899d8.tar.gz mltk-2a1f6f05e3ed8384e84dd7f464de82ba3fb899d8.tar.xz mltk-2a1f6f05e3ed8384e84dd7f464de82ba3fb899d8.zip | |
[vbox-src] properly use generic MAC
Diffstat (limited to 'core/modules/vbox-src/data')
| -rwxr-xr-x | core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc index dc092db4..178da0e7 100755 --- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc +++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc @@ -6,9 +6,7 @@ finalize_machine_config() { VBOX_MACHINE_CONFIG="${VBOX_MACHINES_DIR}/${VM_CLEANNAME}/${VM_CLEANNAME}.xml" # remove ':' from MAC addr for vbox and generate a VDE (virtual device ethernet) - # MAC addr from the first one (put in prefix 00DE) - VM_MAC_ADDR=$(echo ${VM_MAC_ADDR} | sed 's/://g') - VM_VDE_MAC_ADDR=$(echo ${VM_MAC_ADDR} | sed 's/^..../00DE/g') + VM_MAC_ADDR="$(sed 's/://g' <<< ${VM_MAC_ADDR})" # translate network kinds (nat, bridged, host-only) # TODO: Server should prepare this in returned xml @@ -77,7 +75,7 @@ finalize_machine_config() { fi # set the MAC address - set_attr "/VirtualBox/Machine/Hardware/Network/Adapter" "MACAddress" "${VM_VDE_MAC_ADDR}" + set_attr "/VirtualBox/Machine/Hardware/Network/Adapter" "MACAddress" "${VM_MAC_ADDR}" # check if KVM is available and activate it if so if source /run/hwinfo && [ "${HW_KVM}" = "ENABLED" ]; then |