From 45be7903a029fdfdbefdd919e2c63a915bf14ae1 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 6 Oct 1998 23:25:21 +0000
Subject: [PATCH] move ipnat to end of netstart, to support dhcp+ipnat

---
 src/etc/netstart | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index 4c9cb879..58138397 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.43 1998/09/18 18:42:10 deraadt Exp $
+#	$OpenBSD: netstart,v 1.44 1998/10/06 23:25:21 deraadt Exp $
 
 # /etc/myname contains my symbolic name
 #
@@ -14,7 +14,6 @@ fi
 . /etc/rc.conf
 
 # Configure the IP filter before configuring network interfaces
-#
 if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then
 	echo 'configuring IP filter'
 	ipf -Fa -f ${ipfilter_rules} -E
@@ -22,15 +21,6 @@ else
 	ipfilter=NO
 fi
 
-# Configure NAT before configuring network interfaces
-#
-if [ "${ipnat}" = "YES" -a "${ipfilter}" = "YES" -a -f "${ipnat_rules}" ]; then
-	echo 'configuring NAT'
-	ipnat -CF -f ${ipnat_rules}
-else
-	ipnat=NO
-fi
-
 # set the address for the loopback interface
 ifconfig lo0 inet localhost
 
@@ -118,3 +108,12 @@ else
 	# default multicast route
 	route -n add -net 224.0.0.0 -interface $hostname
 fi
+
+# Configure NAT after configuring network interfaces
+if [ "${ipnat}" = "YES" -a "${ipfilter}" = "YES" -a -f "${ipnat_rules}" ]; then
+	echo 'configuring NAT'
+	ipnat -CF -f ${ipnat_rules}
+else
+	ipnat=NO
+fi
+