summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorAlexander Langer <alex@FreeBSD.org>2003-02-12 17:11:09 +0000
committerAlexander Langer <alex@FreeBSD.org>2003-02-12 17:11:09 +0000
commit5d12a3bc25d03c4b24ecfd55510668a44befecc4 (patch)
treea63e0fdb465ff2a36a6cd2a6150a546889aeacb1 /emulators
parentBump PORTREVISION to the 5-Feb-2003 release date of GCC 3.2.2 to make sure (diff)
Fix the stupid manual merge error I did in the last commit.
Notes
Notes: svn path=/head/; revision=75381
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vmware2/files/vmware.sh5
-rw-r--r--emulators/vmware3/files/vmware.sh5
2 files changed, 4 insertions, 6 deletions
diff --git a/emulators/vmware2/files/vmware.sh b/emulators/vmware2/files/vmware.sh
index 2f4172c246d4..2f2d1f00d674 100644
--- a/emulators/vmware2/files/vmware.sh
+++ b/emulators/vmware2/files/vmware.sh
@@ -46,8 +46,6 @@ exec >/dev/null
case $1 in
start)
kldstat -v | grep vmmon >/dev/null || kldload ${vmware_libdir}/modules/vmmon_${suffix}.ko
- echo -n > /dev/vmnet1
- echo -n > /dev/vmnet1
if [ $networking -eq 1 ]; then
kldstat -v | grep if_tap >/dev/null || kldload if_tap.ko
if [ ! -e $dev_vmnet1 ]; then
@@ -55,7 +53,8 @@ start)
echo "Your VMware installation seems broken. Please reinstall VMware port." >&2
exit 255
fi
- echo -n > $dev_vmnet1
+ echo -n > /dev/vmnet1 2>&1 || true
+ 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
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
index 2f4172c246d4..2f2d1f00d674 100644
--- a/emulators/vmware3/files/vmware.sh
+++ b/emulators/vmware3/files/vmware.sh
@@ -46,8 +46,6 @@ exec >/dev/null
case $1 in
start)
kldstat -v | grep vmmon >/dev/null || kldload ${vmware_libdir}/modules/vmmon_${suffix}.ko
- echo -n > /dev/vmnet1
- echo -n > /dev/vmnet1
if [ $networking -eq 1 ]; then
kldstat -v | grep if_tap >/dev/null || kldload if_tap.ko
if [ ! -e $dev_vmnet1 ]; then
@@ -55,7 +53,8 @@ start)
echo "Your VMware installation seems broken. Please reinstall VMware port." >&2
exit 255
fi
- echo -n > $dev_vmnet1
+ echo -n > /dev/vmnet1 2>&1 || true
+ 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