Browse Source

move ipnat to end of netstart, to support dhcp+ipnat

OPENBSD_2_4
deraadt 26 years ago
parent
commit
45be7903a0
1 changed files with 10 additions and 11 deletions
  1. +10
    -11
      src/etc/netstart

+ 10
- 11
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # /etc/myname contains my symbolic name
# #
@ -14,7 +14,6 @@ fi
. /etc/rc.conf . /etc/rc.conf
# Configure the IP filter before configuring network interfaces # Configure the IP filter before configuring network interfaces
#
if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then
echo 'configuring IP filter' echo 'configuring IP filter'
ipf -Fa -f ${ipfilter_rules} -E ipf -Fa -f ${ipfilter_rules} -E
@ -22,15 +21,6 @@ else
ipfilter=NO ipfilter=NO
fi 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 # set the address for the loopback interface
ifconfig lo0 inet localhost ifconfig lo0 inet localhost
@ -118,3 +108,12 @@ else
# default multicast route # default multicast route
route -n add -net 224.0.0.0 -interface $hostname route -n add -net 224.0.0.0 -interface $hostname
fi 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

Loading…
Cancel
Save