===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/netstart,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
*** src/etc/netstart	2003/08/27 11:49:36	1.87
--- src/etc/netstart	2003/10/20 17:53:32	1.88
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.87 2003/08/27 11:49:36 henning Exp $
  
  # Returns true if $1 contains only alphanumerics
  isalphanumeric() {
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: netstart,v 1.88 2003/10/20 17:53:32 david Exp $
  
  # Returns true if $1 contains only alphanumerics
  isalphanumeric() {
***************
*** 250,258 ****
  	test "$if" = "*" && continue
  
  	case $if in
! 	"gif"*|"gre"*)
! 		# GIF and GRE interfaces need the routes to be setup before
! 		# they are configured.
  		continue
  		;;
  	*)
--- 250,258 ----
  	test "$if" = "*" && continue
  
  	case $if in
! 	"carp"*|"gif"*|"gre"*)
! 		# CARP, GIF and GRE interfaces need the routes to be setup
! 		# before they are configured.
  		continue
  		;;
  	*)
***************
*** 316,322 ****
  	;;
  esac
  
! # Configure all the gif and gre interfaces which we know about.
  # They were delayed because they require the routes to be set.
  for hn in /etc/hostname.*; do
  	# Strip off /etc/hostname. prefix
--- 316,322 ----
  	;;
  esac
  
! # Configure all the carp, gif and gre interfaces which we know about.
  # They were delayed because they require the routes to be set.
  for hn in /etc/hostname.*; do
  	# Strip off /etc/hostname. prefix
***************
*** 324,330 ****
  	test "$if" = "*" && continue
  
  	case $if in
! 	"gif"*|"gre"*)
  		ifstart $if
  		;;
  	*)
--- 324,330 ----
  	test "$if" = "*" && continue
  
  	case $if in
! 	"carp"*|"gif"*|"gre"*)
  		ifstart $if
  		;;
  	*)