Browse Source

Remove pre-rc.d(8) backward compatibility.

See faq/current.html for more information.
The local_rcconf variable is not used anywhere anymore so drop it.
suggested by deraadt@
ok sthen@
OPENBSD_5_3
ajacoutot 12 years ago
parent
commit
6505f95e1c
1 changed files with 2 additions and 23 deletions
  1. +2
    -23
      src/etc/rc.conf

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

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: rc.conf,v 1.173 2012/11/04 21:47:22 kettenis Exp $
# $OpenBSD: rc.conf,v 1.174 2012/11/17 07:51:35 ajacoutot Exp $
# DO NOT EDIT THIS FILE!! # DO NOT EDIT THIS FILE!!
# #
@ -132,13 +132,7 @@ shlib_dirs= # extra directories for ldconfig, separated
# started in the specified order and stopped in reverse order # started in the specified order and stopped in reverse order
pkg_scripts= pkg_scripts=
local_rcconf="/etc/rc.conf.local"
unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
unset kpasswdd_flags nfsd_flags mountd_flags lockd_flags
unset statd_flags amd_flags ypbind_flags sndiod_flags
[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
[ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
# special care needed for spamlogd to avoid starting it up and failing # special care needed for spamlogd to avoid starting it up and failing
# all the time # all the time
@ -151,18 +145,3 @@ fi
if [ X"${pf}" = X"NO" ]; then if [ X"${pf}" = X"NO" ]; then
pflogd_flags=NO pflogd_flags=NO
fi fi
# backward compatibility
: ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
: ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}
: ${portmap_flags=$([ X"${portmap-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)}
: ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
: ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
: ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
: ${statd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
: ${amd_flags=$([ X"${amd-NO}" = XYES ] || echo NO)}
: ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)}
: ${sndiod_flags=${aucat_flags-}}

Loading…
Cancel
Save