===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/netstart,v
retrieving revision 1.45
retrieving revision 1.46
diff -c -r1.45 -r1.46
*** src/etc/netstart	1998/10/28 19:17:10	1.45
--- src/etc/netstart	1999/03/01 05:04:24	1.46
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.45 1998/10/28 19:17:10 millert Exp $
  
  # Returns true if $1 contains only alphanumerics
  isalphanumeric() {
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.46 1999/03/01 05:04:24 millert Exp $
  
  # Returns true if $1 contains only alphanumerics
  isalphanumeric() {
***************
*** 89,96 ****
              read af name mask bcaddr extras
              read dt dtaddr
  
! 	    # check to see if device should be configure by dhcp
! 	    if [ "$af" = "dhcp" ]; then
  		ifconfig $if $extras down
  		cmd="/sbin/dhclient $if";
  	    else
--- 89,99 ----
              read af name mask bcaddr extras
              read dt dtaddr
  
! 	    # $af can be either "up", "dhcp", or an address family.
! 	    if [ "$af" = "up" ]; then
! 		# The only one of these guaranteed to be set is $if
! 		ifconfig $if $name $mask $bcaddr $extras up
! 	    elif [ "$af" = "dhcp" ]; then
  		ifconfig $if $extras down
  		cmd="/sbin/dhclient $if";
  	    else