Browse Source

Unhook rtsol(8) and rtsold(8) from the build.

OK deraadt@
OPENBSD_5_7
florian 10 years ago
parent
commit
2a48ab0f80
3 changed files with 5 additions and 9 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +2
    -4
      src/etc/rc
  3. +1
    -3
      src/etc/rc.conf

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.399 2014/11/17 18:19:08 deraadt Exp $
# $OpenBSD: Makefile,v 1.400 2014/12/03 20:13:49 florian Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@ -55,7 +55,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \
hostapd hotplugd httpd identd ifstated iked inetd isakmpd iscsid \
ldapd ldattach ldomd ldpd lockd lpd mopd mountd mrouted nfsd \
npppd nsd ntpd ospf6d ospfd pflogd portmap rarpd rbootd relayd \
ripd route6d rtadvd rtsold sasyncd sensorsd slowcgi smtpd sndiod \
ripd route6d rtadvd sasyncd sensorsd slowcgi smtpd sndiod \
snmpd spamd spamlogd sshd statd syslogd tftpd tftpproxy unbound \
watchdogd wsmoused xdm ypbind ypldap yppasswdd ypserv


+ 2
- 4
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.445 2014/11/30 18:06:45 dcoppa Exp $
# $OpenBSD: rc,v 1.446 2014/12/03 20:13:49 florian Exp $
# System startup script run by init on autoboot
# or after single-user.
@ -491,9 +491,7 @@ start_daemon relayd dhcpd dhcrelay mrouted dvmrpd
if ifconfig lo0 inet6 >/dev/null 2>&1; then
fw=`sysctl -n net.inet6.ip6.forwarding`
if [ X"${fw}" = X"0" ]; then
start_daemon rtsold
else
if [ X"${fw}" = X"1" ]; then
start_daemon route6d rtadvd
fi
fi


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

@ -1,4 +1,4 @@
# $OpenBSD: rc.conf,v 1.199 2014/09/15 22:28:58 matthieu Exp $
# $OpenBSD: rc.conf,v 1.200 2014/12/03 20:13:49 florian Exp $
# DO NOT EDIT THIS FILE!!
#
@ -38,8 +38,6 @@ rtadvd_flags=NO # for normal use: list of interfaces
# be sure to set net.inet6.ip6.forwarding=1
route6d_flags=NO # for normal use: ""
# be sure to set net.inet6.ip6.forwarding=1
rtsold_flags=NO # for normal use: interface
# be sure to set net.inet6.ip6.forwarding=0
lpd_flags=NO # for normal use: "" (or "-l" for debugging)
sensorsd_flags=NO # for normal use: ""
hotplugd_flags=NO # for normal use: ""


Loading…
Cancel
Save