diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-04-29 14:11:33 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-04-29 14:11:33 +0000 |
| commit | ab57702df769d8c244d528d09917f03ba5ca0e38 (patch) | |
| tree | 080ce368c1bde3390bfb5f0651a95c6511a295bb /etc | |
| parent | 2d1fead3edd37b090a8827dfb65c9027599f2c7e (diff) | |
Remove most of pre-rc.d(8) backward compatibility.
ok krw@ sthen@ rpe@ halex@ dcoppa@
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.conf | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 0e136bd84c6..881ff9e6fd2 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.177 2013/04/21 10:30:58 deraadt Exp $ +# $OpenBSD: rc.conf,v 1.178 2013/04/29 14:11:32 ajacoutot Exp $ # DO NOT EDIT THIS FILE!! # @@ -132,9 +132,7 @@ shlib_dirs= # extra directories for ldconfig, separated # started in the specified order and stopped in reverse order pkg_scripts= -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 +unset kadmind_flags kdc_flags kpasswdd_flags mountd_flags nfsd_flags ypbind_flags [ -f /etc/rc.conf.local ] && . /etc/rc.conf.local @@ -151,16 +149,9 @@ if [ X"${pf}" = X"NO" ]; then 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)} +: ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_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)} +: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)} : ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)} -: ${sndiod_flags=${aucat_flags-}} |