summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/vmware
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-03-06 02:22:37 +0100
committerDirk von Suchodoletz2009-03-06 02:22:37 +0100
commit544bd304c7aeb20db06025a7f921714003b62b1f (patch)
tree8f84bb3649e7a57a7973fd07950ac70f3173ed09 /os-plugins/plugins/vmware
parentMore on qemukvm plugin: Fixes, network shutdown script, ... (diff)
downloadcore-544bd304c7aeb20db06025a7f921714003b62b1f.tar.gz
core-544bd304c7aeb20db06025a7f921714003b62b1f.tar.xz
core-544bd304c7aeb20db06025a7f921714003b62b1f.zip
Plugin fixes and hints on future stuff.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2688 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware')
-rw-r--r--os-plugins/plugins/vmware/XX_vmware.sh5
-rw-r--r--os-plugins/plugins/vmware/files/run-virt.include2
2 files changed, 5 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index f3e059b7..2ace7706 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -135,8 +135,9 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
mknod /dev/vmnet8 c 119 8
fi
# copy the runlevel script to the proper place and activate it
- cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware.init \
- /mnt/etc/init.d/vmware-env \
+ sed "s/eth0/$nwif/g" \
+ /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware.init \
+ > /mnt/etc/init.d/vmware-env \
|| echo " * Error copying runlevel script. Shouldn't happen."
chmod a+x /mnt/etc/init.d/vmware-env
rllinker "vmware-env" 20 2
diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index 7ae843ea..05beca36 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -100,6 +100,8 @@ ethernet0.present = \"TRUE\"
ethernet0.addressType = \"static\"
#ethernet0.virtualDev = \"e1000\"
ethernet0.connectionType = \"${network_kind}\"
+#ethernet1.connectionType = \"custom\"
+#ethernet1.vnet = \"/dev/vmnet2\"
ethernet0.address = \"00:50:56:0D:${mac}\"
ethernet0.wakeOnPcktRcv = \"FALSE\"