From ad2a9d04d16854d63712eba2a4aa4fe710d82219 Mon Sep 17 00:00:00 2001 From: Nick Sayer Date: Fri, 11 Feb 2000 14:49:42 +0000 Subject: [PATCH] When running dhclient on a PC-Card insertion, specify the inserted interface on the dhclient command line. Not doing so screws up vmware's network interface by attempting to configure it for DHCP (which will never work, of course). It also would impact any other interface that may be present that, again, would likely be manually configured for some other purpose. Approved by: jkh --- etc/pccard_ether | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/etc/pccard_ether b/etc/pccard_ether index 2bc3a192b3a..dafbc2370e8 100755 --- a/etc/pccard_ether +++ b/etc/pccard_ether @@ -15,6 +15,9 @@ elif [ -r /etc/rc.conf ]; then . /etc/rc.conf fi +interface=$1 +shift + case ${pccard_ifconfig} in [Nn][Oo] | '') ;; @@ -24,20 +27,18 @@ case ${pccard_ifconfig} in kill `cat /var/run/dhclient.pid` rm /var/run/dhclient.pid fi - /sbin/dhclient + /sbin/dhclient $interface elif [ -r /usr/local/sbin/dhcpc ]; then if [ -s /var/run/dhcpc.pid ]; then kill `cat /var/run/dhcpc.pid` rm /var/run/dhcpc.pid fi - /usr/local/sbin/dhcpc $* + /usr/local/sbin/dhcpc $interface $* else echo "DHCP client software not available (isc-dhcp2)" fi ;; *) - interface=$1 - shift ifconfig ${interface} ${pccard_ifconfig} $* ;; esac