===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/netstart,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/etc/netstart	2009/11/22 23:09:50	1.127
--- src/etc/netstart	2009/12/10 00:51:55	1.128
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.127 2009/11/22 23:09:50 deraadt Exp $
  
  # Strip comments (and leading/trailing whitespace if IFS is set)
  # from a file and spew to stdout
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.128 2009/12/10 00:51:55 todd Exp $
  
  # Strip comments (and leading/trailing whitespace if IFS is set)
  # from a file and spew to stdout
***************
*** 93,103 ****
  			rtsolif="$rtsolif $if"
  			cmd="ifconfig $if $name $mask $bcaddr $ext1 $ext2 up"
  			;;
- 		"up")
- 			# The only one of these guaranteed to be set is $if.
- 			# The remaining ones exist so that media controls work.
- 			cmd="ifconfig $if $name $mask $bcaddr $ext1 $ext2 up"
- 			;;
  		*)
  			read dt dtaddr
  			if [ "$name"  = "alias" ]; then
--- 93,98 ----
***************
*** 120,138 ****
  				cmd2="$dt $dtaddr"
  				;;
  			esac
- 			if [ ! -n "$name" ]; then
- 				echo "/etc/hostname.$if: invalid network configuration file"
- 				return
- 			fi
  			case $af in
  			inet)
  				[ "$mask" ] && cmd="$cmd netmask $mask"
  				if [ "$bcaddr" -a "X$bcaddr" != "XNONE" ]; then
  					cmd="$cmd broadcast $bcaddr"
  				fi
  				[ "$alias" ] && rtcmd=";route -qn add -host $name 127.0.0.1"
  				;;
! 			inet6) [ "$mask" ] && cmd="$cmd prefixlen $mask"
  				cmd="$cmd $bcaddr"
  				;;
  			*)
--- 115,138 ----
  				cmd2="$dt $dtaddr"
  				;;
  			esac
  			case $af in
  			inet)
+ 				if [ ! -n "$name" ]; then
+ 					echo "/etc/hostname.$if: inet alone is invalid"
+ 					return
+ 				fi
  				[ "$mask" ] && cmd="$cmd netmask $mask"
  				if [ "$bcaddr" -a "X$bcaddr" != "XNONE" ]; then
  					cmd="$cmd broadcast $bcaddr"
  				fi
  				[ "$alias" ] && rtcmd=";route -qn add -host $name 127.0.0.1"
  				;;
! 			inet6)
! 				if [ ! -n "$name" ]; then
! 					echo "/etc/hostname.$if: inet6 alone is invalid"
! 					return
! 				fi
! 				[ "$mask" ] && cmd="$cmd prefixlen $mask"
  				cmd="$cmd $bcaddr"
  				;;
  			*)