From bd9da8ca6c76167b6e6061568d260046c273139e Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sun, 3 Apr 2005 19:39:31 +0000
Subject: [PATCH] if dhcp is used to get an address on any interface, ignore
 /etc/mygate ok krw (this lets us do something rather cool with the zaurus in
 particular)

---
 src/etc/netstart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index 08938d14..4124431e 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.102 2005/01/04 15:40:53 mcbride Exp $
+#	$OpenBSD: netstart,v 1.103 2005/04/03 19:39:31 deraadt Exp $
 
 # Strip comments (and leading/trailing whitespace if IFS is set)
 # from a file and spew to stdout
@@ -83,6 +83,7 @@ ifstart() {
 			[ "$bcaddr" = "NONE" ] && bcaddr=
 			ifconfig $if $name $mask $bcaddr $ext1 $ext2 down
 			cmd="dhclient $if"
+			setgateway=N
 			;;
 		"rtsol")
 			ifconfig $if $name $mask $bcaddr $ext1 $ext2 up
@@ -320,7 +321,7 @@ done
 
 # /etc/mygate, if it exists, contains the name of my gateway host
 # that name must be in /etc/hosts.
-if [ -f /etc/mygate ]; then
+if [ "X${setgateway} != X"N" -a -f /etc/mygate ]; then
 	route -qn delete default > /dev/null 2>&1
 	route -qn add -host default `stripcom /etc/mygate`
 fi