Attachment 44222 Details for Bug 68532 – file.diff

[patch] file.diff

file.diff (text/plain), 5.75 KB, created by per on 2004-06-30 23:50:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: per

Created: 2004-06-30 23:50:05 UTC

Size: 5.75 KB

patch

obsolete

>--- /usr/ports/emulators/vmware3/files/001.vmware.sh.ORIG	Sat Jun 12 01:35:29 2004
>+++ /usr/ports/emulators/vmware3/files/001.vmware.sh	Wed Jun 23 01:23:31 2004
>@@ -24,10 +24,7 @@
> vmware=`vmware_config vmware.fullpath`
> vmware_libdir=`vmware_config libdir`
> networking=@@NETWORKING@@
>-bridged=@@BRIDGED@@
>-bridge_interface=@@BRIDGE_INTF@@
>-host_ip=`vmware_config vmnet1.HostOnlyAddress`
>-netmask=`vmware_config vmnet1.HostOnlyNetMask`
>+addr_on_bridge_if=@@ADDR_BRIDGE_IF@@
> dev_vmnet1=/dev/vmnet1
> 
> if [ ! -x $vmware ]; then
>@@ -54,22 +51,47 @@
> 		echo "Your VMware installation seems broken.  Please reinstall VMware port." >&2
> 		exit 255
> 	fi
>-       (echo -n > $dev_vmnet1) 2>/dev/null || \
>-	    echo -n > /dev/vmnet1 2>&1
>-	ifconfig vmnet1 $host_ip netmask $netmask
>-	if [ X$bridged = XYES ]; then
>-	    kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko
>-	    kldstat -v | grep ng_ether >/dev/null || kldload ng_ether.ko
>-	    kldstat -v | grep ng_bridge >/dev/null || kldload ng_bridge.ko
>-	    ngctl mkpeer vmnet1: bridge lower link0
>-	    ngctl name vmnet1:lower vmnet_bridge
>-	    ngctl connect vmnet_bridge: ${bridge_interface}: link1 lower
>-	    ngctl connect vmnet_bridge: ${bridge_interface}: link2 upper
>-	    ngctl msg ${bridge_interface}: setautosrc 0
>-	    ngctl msg ${bridge_interface}: setpromisc 1
>-	    ngctl msg vmnet1: setautosrc 0
>-	    ngctl msg vmnet1: setpromisc 1
>-	fi
>+	vmnet_no=1
>+	bridge_no=1
>+	while true; do
>+	    vmnet=vmnet$vmnet_no
>+	    vmnet_no=`expr $vmnet_no + 1`
>+	    bridged=`vmware_config $vmnet.Bridged`
>+	    if [ X$bridged = X ]; then
>+		break
>+	    fi
>+	    host_ip=`vmware_config $vmnet.HostOnlyAddress`
>+	    netmask=`vmware_config $vmnet.HostOnlyNetMask`
>+	    echo -n > /dev/$vmnet 2>&1
>+	    ifconfig $vmnet $host_ip netmask $netmask
>+	    if [ X$bridged = XYES ]; then
>+		if [ X$addr_on_bridge_if = XNO ]; then
>+		    # XXX Still need to configure + delete to make it RUNNING
>+		    ifconfig $vmnet delete $host_ip
>+		fi
>+		bridge_interface=`vmware_config $vmnet.BridgeInterface`
>+		eval vmnet_bridge=\$vmnet_bridge_$bridge_interface
>+		if [ X$vmnet_bridge = X ]; then
>+		    kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko
>+		    kldstat -v | grep ng_ether >/dev/null || kldload ng_ether.ko
>+		    kldstat -v | grep ng_bridge >/dev/null || kldload ng_bridge.ko
>+		    vmnet_bridge=vmnet_bridge$bridge_no
>+		    bridge_no=`expr $bridge_no + 1`
>+		    eval vmnet_bridge_$bridge_interface=$vmnet_bridge
>+		    ngctl mkpeer ${bridge_interface}: bridge lower link0
>+		    ngctl name ${bridge_interface}:lower ${vmnet_bridge}
>+		    ngctl connect ${vmnet_bridge}: ${bridge_interface}: link1 upper
>+		    ngctl msg ${bridge_interface}: setautosrc 0
>+		    ngctl msg ${bridge_interface}: setpromisc 1
>+		    eval ${vmnet_bridge}_linkno=2
>+		fi
>+		eval linkno=\$${vmnet_bridge}_linkno
>+		eval ${vmnet_bridge}_linkno=`expr $linkno + 1`
>+		ngctl connect ${vmnet_bridge}: ${vmnet}: link$linkno lower
>+		ngctl msg ${vmnet}: setautosrc 0
>+		ngctl msg ${vmnet}: setpromisc 1
>+	    fi
>+	done
>     fi
>     echo -n " VMware" >&2
>     ;;
>@@ -77,13 +99,35 @@
> stop)
>     kldunload vmmon_${suffix}
>     if [ $networking -eq 1 ]; then
>-	ifconfig vmnet1 down
>-	ifconfig vmnet1 delete $host_ip
>-	if [ X$bridged = XYES ]; then
>-	    ngctl shutdown vmnet_bridge:
>-	    ngctl msg ${bridge_interface}: setautosrc 1
>-	    ngctl msg ${bridge_interface}: setpromisc 0
>-	fi
>+	vmnet_no=1
>+	bridge_no=1
>+	while true; do
>+	    vmnet=vmnet$vmnet_no
>+	    vmnet_no=`expr $vmnet_no + 1`
>+	    bridged=`vmware_config $vmnet.Bridged`
>+	    if [ X$bridged = X ]; then
>+		break
>+	    fi
>+	    host_ip=`vmware_config $vmnet.HostOnlyAddress`
>+	    ifconfig $vmnet down
>+	    if [ X$bridged = XYES ]; then
>+		if [ X$addr_on_bridge_if = XYES ]; then
>+		    ifconfig $vmnet delete $host_ip
>+		fi
>+		bridge_interface=`vmware_config $vmnet.BridgeInterface`
>+		eval vmnet_bridge=\$vmnet_bridge_$bridge_interface
>+		if [ X$vmnet_bridge = X ]; then
>+		    vmnet_bridge=vmnet_bridge$bridge_no
>+		    bridge_no=`expr $bridge_no + 1`
>+		    eval vmnet_bridge_$bridge_interface=$vmnet_bridge
>+		    ngctl msg ${bridge_interface}: setautosrc 1
>+		    ngctl msg ${bridge_interface}: setpromisc 0
>+		    ngctl shutdown ${vmnet_bridge}:
>+		fi
>+	    else
>+		ifconfig $vmnet delete $host_ip
>+	    fi
>+	done
> 	kldunload vmnet.ko
>     fi
>     ;;
>--- /usr/ports/emulators/vmware3/files/config.ORIG	Tue Oct 21 19:36:03 2003
>+++ /usr/ports/emulators/vmware3/files/config	Tue Jun 22 00:26:55 2004
>@@ -3,5 +3,7 @@
> dhcpd.fullpath = "@@PREFIX@@/lib/vmware/bin/vmnet-dhcpd"
> loop.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-loop"
> libdir = "@@PREFIX@@/lib/vmware"
>+vmnet1.Bridged = "@@BRIDGED@@"
>+vmnet1.BridgeInterface = "@@BRIDGE_INTF@@"
> vmnet1.HostOnlyAddress = "@@HOST_IP@@"
> vmnet1.HostOnlyNetMask = "@@NETMASK@@"
>--- /usr/ports/emulators/vmware3/Makefile.ORIG	Sun Jun 13 00:02:41 2004
>+++ /usr/ports/emulators/vmware3/Makefile	Wed Jun 23 00:58:38 2004
>@@ -68,6 +68,8 @@
> VMNET1_MINOR=	0x00800001
> .endif
> 
>+VMNET_ADDR_ON_BRIDGED_INTERFACE= NO
>+
> SCRIPTS_ENV+=	LINUXBASE="${LINUXBASE}" \
> 		VMNET_HOST_IP="${VMNET_HOST_IP}" \
> 		VMNET_NETMASK="${VMNET_NETMASK}" \
>@@ -134,6 +136,8 @@
> 
> setoptions:
> 	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
>+		-e 's;@@BRIDGED@@;${VMNET_BRIDGED};' \
>+		-e 's;@@BRIDGE_INTF@@;${VMNET_BRIDGED_INTERFACE};' \
> 		-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
> 		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
> 		${FILESDIR}/config > ${WRKDIR}/config
>@@ -141,8 +145,7 @@
> 	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
> 		-e 's;@@LINUXBASE@@;${LINUXBASE};' \
> 		-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
>-		-e 's;@@BRIDGED@@;${VMNET_BRIDGED};' \
>-		-e 's;@@BRIDGE_INTF@@;${VMNET_BRIDGED_INTERFACE};' \
>+		-e 's;@@ADDR_BRIDGE_IF@@;${VMNET_ADDR_ON_BRIDGED_INTERFACE};' \
> 		${FILESDIR}/001.vmware.sh > ${WRKDIR}/001.vmware.sh
> 
> 	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \

Actions: View | Diff

Attachments on bug 68532: 44222