Browse Source

things come from rc.conf not netstart nowadays

OPENBSD_2_3
deraadt 27 years ago
parent
commit
ac1bf55c0f
3 changed files with 18 additions and 18 deletions
  1. +2
    -2
      src/etc/ipf.rules
  2. +2
    -2
      src/etc/nat.rules
  3. +14
    -14
      src/etc/rc

+ 2
- 2
src/etc/ipf.rules View File

@ -1,11 +1,11 @@
# $OpenBSD: ipf.rules,v 1.5 1997/04/09 07:32:13 deraadt Exp $
# $OpenBSD: ipf.rules,v 1.6 1997/11/04 08:39:32 deraadt Exp $
# #
# IP filtering rules. See the ipf(5) man page for more # IP filtering rules. See the ipf(5) man page for more
# information on the format of this file, and /usr/share/ipf # information on the format of this file, and /usr/share/ipf
# for example configuration files. # for example configuration files.
# #
# Pass all packets by default. # Pass all packets by default.
# edit the ipfilter= line in /etc/netstart to enable IP filtering
# edit the ipfilter= line in /etc/rc.conf to enable IP filtering
# #
pass in from any to any pass in from any to any
pass out from any to any pass out from any to any

+ 2
- 2
src/etc/nat.rules View File

@ -1,6 +1,6 @@
# $OpenBSD: nat.rules,v 1.2 1997/04/09 07:32:14 deraadt Exp $
# $OpenBSD: nat.rules,v 1.3 1997/11/04 08:39:32 deraadt Exp $
# #
# See /usr/share/ipf/nat.1 for examples. # See /usr/share/ipf/nat.1 for examples.
# edit the nat= line in /etc/netstart to enable Network Address Translation
# edit the nat= line in /etc/rc.conf to enable Network Address Translation
#map ppp0 10.0.0.0/8 -> ppp0/32 portmap tcp/udp 10000:20000 #map ppp0 10.0.0.0/8 -> ppp0/32 portmap tcp/udp 10000:20000

+ 14
- 14
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.51 1997/10/15 16:28:29 millert Exp $
# $OpenBSD: rc,v 1.52 1997/11/04 08:39:33 deraadt Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -100,7 +100,7 @@ if [ X"${rfc1323}" = X"NO" ]; then
echo 'disabling rfc1323'; sysctl -w net.inet.tcp.rfc1323=0 echo 'disabling rfc1323'; sysctl -w net.inet.tcp.rfc1323=0
fi fi
# $photurisd_flags is imported from /etc/netstart;
# $photurisd_flags is imported from /etc/rc.conf;
# If $photurisd_flags == NO or /etc/photuris/photuris.conf doesn't exist, then # If $photurisd_flags == NO or /etc/photuris/photuris.conf doesn't exist, then
# photurisd isn't run. # photurisd isn't run.
if [ "X${photurisd_flags}" != X"NO" -a -e /etc/photuris/photuris.conf ]; then if [ "X${photurisd_flags}" != X"NO" -a -e /etc/photuris/photuris.conf ]; then
@ -115,7 +115,7 @@ rm -f /var/spool/uucp/STST/*
echo -n 'starting rpc daemons:' echo -n 'starting rpc daemons:'
# $portmap is imported from /etc/netstart;
# $portmap is imported from /etc/rc.conf;
# if $portmap == YES, the portmapper is started. # if $portmap == YES, the portmapper is started.
if [ X"${portmap}" = X"YES" ]; then if [ X"${portmap}" = X"YES" ]; then
echo -n ' portmap'; portmap echo -n ' portmap'; portmap
@ -150,7 +150,7 @@ if [ -d /var/yp/binding ]; then
fi fi
fi fi
# $nfs_server is imported from /etc/netstart;
# $nfs_server is imported from /etc/rc.conf;
# if $nfs_server == YES, the machine is setup for being an nfs server # if $nfs_server == YES, the machine is setup for being an nfs server
if [ X${nfs_server} = X"YES" -a -r /etc/exports -a \ if [ X${nfs_server} = X"YES" -a -r /etc/exports -a \
`cat /etc/exports | sed -e '/^#/d' | wc -l` -ne 0 ]; then `cat /etc/exports | sed -e '/^#/d' | wc -l` -ne 0 ]; then
@ -163,7 +163,7 @@ if [ X${nfs_server} = X"YES" -a -r /etc/exports -a \
fi fi
fi fi
# $nfs_client is imported from /etc/netstart;
# $nfs_client is imported from /etc/rc.conf;
# if $nfs_client == YES, the machine is setup for being an nfs client # if $nfs_client == YES, the machine is setup for being an nfs client
if [ X${nfs_client} = X"YES" ]; then if [ X${nfs_client} = X"YES" ]; then
echo -n ' nfsiod'; nfsiod -n 4 echo -n ' nfsiod'; nfsiod -n 4
@ -182,7 +182,7 @@ echo -n 'starting system logger'
rm -f /dev/log rm -f /dev/log
syslogd syslogd
# $timed_flags is imported from /etc/netstart;
# $timed_flags is imported from /etc/rc.conf;
# if $timed_flags == NO, timed isn't run. # if $timed_flags == NO, timed isn't run.
if [ "X${timed_flags}" != X"NO" ]; then if [ "X${timed_flags}" != X"NO" ]; then
echo -n ', time daemon'; timed $timed_flags echo -n ', time daemon'; timed $timed_flags
@ -287,7 +287,7 @@ echo '.'
echo -n starting network daemons: echo -n starting network daemons:
# $gated and $routed_flags are imported from /etc/netstart.
# $gated and $routed_flags are imported from /etc/rc.conf.
# If $gated == YES, gated is used; otherwise routed. # If $gated == YES, gated is used; otherwise routed.
# If $routed_flags == NO, routed isn't run. # If $routed_flags == NO, routed isn't run.
if [ X${gated} = X"YES" -a -r /etc/gated.conf ]; then if [ X${gated} = X"YES" -a -r /etc/gated.conf ]; then
@ -296,20 +296,20 @@ elif [ "X${routed_flags}" != X"NO" ]; then
echo -n ' routed'; routed $routed_flags echo -n ' routed'; routed $routed_flags
fi fi
# $mrouted_flags is imported from /etc/netstart;
# $mrouted_flags is imported from /etc/rc.conf;
# If $mrouted_flags == NO, then mrouted isn't run. # If $mrouted_flags == NO, then mrouted isn't run.
if [ "X${mrouted_flags}" != X"NO" ]; then if [ "X${mrouted_flags}" != X"NO" ]; then
echo -n ' mrouted'; mrouted $mrouted_flags echo -n ' mrouted'; mrouted $mrouted_flags
fi fi
# $named_flags is imported from /etc/netstart;
# $named_flags is imported from /etc/rc.conf;
# if $named_flags != NO, named is run. # if $named_flags != NO, named is run.
if [ "X${named_flags}" != X"NO" ]; then if [ "X${named_flags}" != X"NO" ]; then
echo -n ' named'; named $named_flags echo -n ' named'; named $named_flags
fi fi
mount -a -t nfs # do again, in case DNS hostnames are used.. mount -a -t nfs # do again, in case DNS hostnames are used..
# $rwhod is imported from /etc/netstart;
# $rwhod is imported from /etc/rc.conf;
# if $rwhod == YES, rwhod is run. # if $rwhod == YES, rwhod is run.
if [ X${rwhod} = X"YES" ]; then if [ X${rwhod} = X"YES" ]; then
echo -n ' rwhod'; rwhod echo -n ' rwhod'; rwhod
@ -320,7 +320,7 @@ if [ X${lpd} = X"YES" ]; then
echo -n ' printer'; lpd echo -n ' printer'; lpd
fi fi
# $sendmail_flags is imported from /etc/netstart;
# $sendmail_flags is imported from /etc/rc.conf;
# If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then # If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then
# sendmail isn't run. We call sendmail with a full path so that # sendmail isn't run. We call sendmail with a full path so that
# SIGHUP works. # SIGHUP works.
@ -332,21 +332,21 @@ if [ X${inetd} = X"YES" ]; then
echo -n ' inetd'; inetd echo -n ' inetd'; inetd
fi fi
# $rarpd_flags is imported from /etc/netstart;
# $rarpd_flags is imported from /etc/rc.conf;
# If $rarpd_flags == NO or /etc/ethers doesn't exist, then # If $rarpd_flags == NO or /etc/ethers doesn't exist, then
# rarpd isn't run. # rarpd isn't run.
if [ "X${rarpd_flags}" != X"NO" -a -r /etc/ethers ]; then if [ "X${rarpd_flags}" != X"NO" -a -r /etc/ethers ]; then
echo -n ' rarpd'; rarpd ${rarpd_flags} echo -n ' rarpd'; rarpd ${rarpd_flags}
fi fi
# $bootparamd_flags is imported from /etc/netstart;
# $bootparamd_flags is imported from /etc/rc.conf;
# If $bootparamd_flags == NO or /etc/bootparams doesn't exist, then # If $bootparamd_flags == NO or /etc/bootparams doesn't exist, then
# bootparamd isn't run. # bootparamd isn't run.
if [ "X${bootparamd_flags}" != X"NO" -a -r /etc/bootparams ]; then if [ "X${bootparamd_flags}" != X"NO" -a -r /etc/bootparams ]; then
echo -n ' rpc.bootparamd'; rpc.bootparamd ${bootparamd_flags} echo -n ' rpc.bootparamd'; rpc.bootparamd ${bootparamd_flags}
fi fi
# $rbootd_flags is imported from /etc/netstart;
# $rbootd_flags is imported from /etc/rc.conf;
# If $rbootd_flags == NO or /etc/rbootd.conf doesn't exist, then # If $rbootd_flags == NO or /etc/rbootd.conf doesn't exist, then
# rbootd isn't run. # rbootd isn't run.
if [ "X${rbootd_flags}" != X"NO" -a -r /etc/rbootd.conf ]; then if [ "X${rbootd_flags}" != X"NO" -a -r /etc/rbootd.conf ]; then


Loading…
Cancel
Save