diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-11-17 07:51:36 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-11-17 07:51:36 +0000 |
| commit | 8695f322feb4995692ad43e9ee671f2fefd07a01 (patch) | |
| tree | ff4103151c852ebdb1d1bb2b2f7944c7e2370f45 /etc/rc.conf | |
| parent | ac900bbb63ff7258e980be1d094d09117d67372d (diff) | |
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@
Diffstat (limited to 'etc/rc.conf')
| -rw-r--r-- | etc/rc.conf | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 2879dcd995a..20b11c8f2da 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/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!! # @@ -132,13 +132,7 @@ shlib_dirs= # extra directories for ldconfig, separated # started in the specified order and stopped in reverse order 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 # all the time @@ -151,18 +145,3 @@ fi if [ X"${pf}" = X"NO" ]; then pflogd_flags=NO 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-}} |