Merge with Vladimir's latest version.

- Add support for FreeBSD bridging facility.  To use it, you need a
kernel built with `options BRIDGE'.

- Integrate vmnet and if_tap code into vmmon module.

- Install vmmon/vmnet1 pseudo-device nodes under /compat/linux/dev
instead of /dev

- Set TMPDIR to /var/tmp if empty.

- Change MAINTAINER back to Vladimir N. Silyaev <vns@delta.odessa.ua>,
now he is back and being active. :)

4 files changed, 19 insertions, 10 deletions

diff --git a/emulators/vmware3/files/Makefile b/emulators/vmware3/files/Makefile
index 79759423aeb8..73c7bbd4ac41 100644
--- a/emulators/vmware3/files/Makefile
+++ b/emulators/vmware3/files/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	vmmon-only vmnet-only/freebsd
+SUBDIR=	vmmon-only
 
 .include <bsd.subdir.mk>
diff --git a/emulators/vmware3/files/README.FreeBSD b/emulators/vmware3/files/README.FreeBSD
index 39c78c75e363..78ca8de35360 100644
--- a/emulators/vmware3/files/README.FreeBSD
+++ b/emulators/vmware3/files/README.FreeBSD
@@ -5,10 +5,7 @@ $FreeBSD$
 Introduction.
 
 This piece of software provides some basic support for running
-the VMware 2.0 for Linux on FreeBSD.
-
-I'm using FreeBSD 4.0 -current system and don't know whether
-this software will work on the 3.X branch.
+the VMware 2.0 for Linux on FreeBSD 4.0 and better ;) systems.
 
 ===
 
diff --git a/emulators/vmware3/files/vmware b/emulators/vmware3/files/vmware
index 7109da2fdb63..bb98527690c2 100644
--- a/emulators/vmware3/files/vmware
+++ b/emulators/vmware3/files/vmware
@@ -17,4 +17,10 @@ fi
 LANG=C
 PATH=/bin:$PATH
 
-@@PREFIX@@/lib/vmware/bin/vmware "$@"
+if [ _$TMPDIR = _ ]; then 
+    TMPDIR=/var/tmp
+    echo Setting TMPDIR="$TMPDIR".
+    export TMPDIR
+fi
+
+exec @@PREFIX@@/lib/vmware/bin/vmware "$@"
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
index 1afdbf3e3813..e375434044a4 100644
--- a/emulators/vmware3/files/vmware.sh
+++ b/emulators/vmware3/files/vmware.sh
@@ -23,11 +23,16 @@ case $1 in
 start)
     kldload ${vmware_dir}/lib/modules/vmmon_${suffix}.ko
     if [ $networking -eq 1 ]; then
-	kldload ${vmware_dir}/lib/modules/vmnet.ko
-	echo -n >/dev/vmnet1
+	sysctl net.link.ether.bridge_refresh && bridge="_bridge"
+	kldload if_tap.ko
+	echo -n >@@LINUX_DIR@@/dev/vmnet1
 	ifconfig vmnet1 $host_ip netmask $netmask
+	if [ _$bridge != _ ]; then
+	    sysctl -w net.link.ether.bridge_refresh=1
+	    sysctl -w net.link.ether.bridge=1
+	fi
     fi
-    echo -n " VMware" >/dev/tty
+    echo -n " VMware${bridge}" >&2
     ;;
 
 stop)
@@ -35,7 +40,8 @@ stop)
     if [ $networking -eq 1 ]; then
 	ifconfig vmnet1 down
 	ifconfig vmnet1 delete $host_ip
-	kldunload vmnet
+	sysctl net.link.ether.bridge_refresh && bridge="_bridge"
+	[ _$bridge != _ ] && sysctl -w net.link.ether.bridge_refresh=1
     fi
     ;;