diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-11-17 16:25:45 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-11-17 16:25:45 +0000 |
| commit | cbfcbe6148c0bebc53052fbc85f897d72c7d722d (patch) | |
| tree | e4fcf364624bc39703529d7d89df34b3f95ed9b1 | |
| parent | 88f9ee6046f5e9a32996338b1bd23f103134c52f (diff) | |
Revert previous; there are more things to consider.
| -rw-r--r-- | etc/rc.conf | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 20b11c8f2da..449b4cd88e2 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.174 2012/11/17 07:51:35 ajacoutot Exp $ +# $OpenBSD: rc.conf,v 1.175 2012/11/17 16:25:44 ajacoutot Exp $ # DO NOT EDIT THIS FILE!! # @@ -132,6 +132,10 @@ 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 + [ -f /etc/rc.conf.local ] && . /etc/rc.conf.local # special care needed for spamlogd to avoid starting it up and failing @@ -145,3 +149,18 @@ 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-}} |