Browse Source

No more gated. ok krw@, deraadt@, commments from David Krause, jakob@.

OPENBSD_3_4
ian 21 years ago
parent
commit
eeaf337659
2 changed files with 4 additions and 9 deletions
  1. +3
    -6
      src/etc/rc
  2. +1
    -3
      src/etc/rc.conf

+ 3
- 6
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.226 2003/04/08 01:53:43 millert Exp $
# $OpenBSD: rc,v 1.227 2003/05/14 18:41:06 ian Exp $
# System startup script run by init on autoboot
# or after single-user.
@ -428,12 +428,9 @@ fi
echo -n starting network daemons:
# $gated and $routed_flags are imported from /etc/rc.conf.
# If $gated == YES, gated is used; otherwise routed.
# $routed_flags are imported from /etc/rc.conf.
# If $routed_flags == NO, routed isn't run.
if [ X${gated} = X"YES" -a -e /etc/gated.conf ]; then
echo -n ' gated'; /usr/local/sbin/gated $gated_flags
elif [ "X${routed_flags}" != X"NO" ]; then
if [ "X${routed_flags}" != X"NO" ]; then
echo -n ' routed'; routed $routed_flags
fi


+ 1
- 3
src/etc/rc.conf View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $OpenBSD: rc.conf,v 1.87 2003/05/08 16:53:14 pvalchev Exp $
# $OpenBSD: rc.conf,v 1.88 2003/05/14 18:41:06 ian Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for normal use: "-q"
@ -50,7 +50,6 @@ wsmoused_flags=NO # for ps/2 or usb mice: "", serial: "-p /dev/cua00"
rwhod=NO
nfs_server=NO # see sysctl.conf for nfs client configuration
lockd=NO
gated=NO
amd=NO
pf=NO # Packet filter / NAT
portmap=NO # Note: inetd(8) rpc services need portmap too
@ -70,7 +69,6 @@ multicast_router=NO # A multicast routing daemon will be run, e.g. mrouted
# miscellaneous other flags
# only used if the appropriate server is marked YES above
savecore_flags= # "-z" to compress
gated_flags=
ypserv_flags= # E.g. -1 for YP v1, -d for DNS etc
yppasswdd_flags= # "-d /etc/yp" if passwd files are in /etc/yp
nfsd_flags="-tun 4" # Crank the 4 for a busy NFS fileserver


Loading…
Cancel
Save