diff options
| author | Michael Neves | 2013-06-05 16:04:51 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-06-05 16:04:51 +0200 |
| commit | 8e012bfc9c1b82dfc19a8a177927616f4e7b4f2d (patch) | |
| tree | b9460f884c4e12b264a69b30654f9db6f3235ad7 /remote/modules/vmplayer | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-8e012bfc9c1b82dfc19a8a177927616f4e7b4f2d.tar.gz tm-scripts-8e012bfc9c1b82dfc19a8a177927616f4e7b4f2d.tar.xz tm-scripts-8e012bfc9c1b82dfc19a8a177927616f4e7b4f2d.zip | |
host bridge interface
Diffstat (limited to 'remote/modules/vmplayer')
| -rwxr-xr-x | remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env | 22 | ||||
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 2 |
2 files changed, 2 insertions, 22 deletions
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env index 6200c981..f1f52040 100755 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env @@ -18,24 +18,6 @@ VMWARE_CONF_DIR=/etc/openslx/vmware . /opt/openslx/config . ${VMWARE_CONF_DIR}/vmware.conf -setup_bridge() { - # Init hook to create a bridge on the active network interface - # (should be kept identical to the files of virtualbox and qemukvm plugins) - ############################################################################# - - local bridge=br0 - local brnwif=eth0 - local nwifmac=${SLX_PXE_MAC} - - # bridge 0 already defined or some other problem - brctl addbr ${bridge} - brctl stp ${bridge} 0 - brctl setfd ${bridge} 0.000000000001 - ip link set addr ${nwifmac} ${bridge} - ip link set dev ${nwif} up - brctl addif ${bridge} ${nwif} -} - vm_dhcpd() { #from plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh @@ -233,8 +215,7 @@ if [ -n "$vmnet8" ] ; then ip link set vmnet8 up echo "1" >/proc/sys/net/ipv4/conf/vmnet8/forwarding echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null - # TODO: iptables in stage32? - # iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE + iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50 $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \ -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf # or logfile @@ -254,7 +235,6 @@ vmblock () { case "$1" in start) #start: defines start function for initscript - vm_dhcpd setup_network # adapt_tmpfs # hack to access the first serial/parallel port diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 1c9887ef..a4dd8a29 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,7 +1,7 @@ fetch_source() { #mount vmware bundle directory [ ! -d /mnt/store ] && mkdir -p /mnt/store - if [ "x$(ls /mnt/store)" == "x" ]; then + if [ "x$(ls /mnt/store/vmware/*.bundle)" == "x" ]; then mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store || perror "Could not mount vmware bundle directory. Exiting." fi ARCH="$(uname -m)" |