Browse Source

btd went away

OPENBSD_5_2
deraadt 12 years ago
parent
commit
4ad32a172a
3 changed files with 4 additions and 17 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +2
    -3
      src/etc/rc.conf
  3. +0
    -12
      src/etc/rc.d/btd

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.315 2012/03/16 22:42:51 sthen Exp $
# $OpenBSD: Makefile,v 1.316 2012/04/01 18:32:51 deraadt Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -48,7 +48,7 @@ BIN1+= wsconsctl.conf
BIN2= motd BIN2= motd
# -r-xr-xr-x # -r-xr-xr-x
RCDAEMONS= amd apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd \
RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \ ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
inetd isakmpd ldapd ldattach ldpd lpd mopd mrouted named nginx \ inetd isakmpd ldapd ldattach ldpd lpd mopd mrouted named nginx \
nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \ nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \


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

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: rc.conf,v 1.166 2012/03/05 10:43:42 dlg Exp $
# $OpenBSD: rc.conf,v 1.167 2012/04/01 18:32:51 deraadt Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags # set these to "NO" to turn them off. otherwise, they're used as flags
ldpd_flags=NO # for normal use: "" ldpd_flags=NO # for normal use: ""
@ -122,7 +122,7 @@ pkg_scripts=
local_rcconf="/etc/rc.conf.local" local_rcconf="/etc/rc.conf.local"
unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
unset kpasswdd_flags btd_flags nfsd_flags mountd_flags lockd_flags
unset kpasswdd_flags nfsd_flags mountd_flags lockd_flags
unset statd_flags amd_flags ypbind_flags sndiod_flags unset statd_flags amd_flags ypbind_flags sndiod_flags
[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
@ -146,7 +146,6 @@ fi
: ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)} : ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
: ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)} : ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
: ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)} : ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
: ${btd_flags=$([ X"${bt-NO}" = XYES ] || echo NO)}
: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)} : ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
: ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)} : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
: ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)} : ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}


+ 0
- 12
src/etc/rc.d/btd View File

@ -1,12 +0,0 @@
#!/bin/sh
#
# $OpenBSD: btd,v 1.2 2011/07/08 04:29:54 ajacoutot Exp $
daemon="/usr/sbin/btd"
. /etc/rc.d/rc.subr
pexp="btd: \[priv\]"
rc_reload=NO
rc_cmd $1

Loading…
Cancel
Save