diff options
| author | Anil Madhavapeddy <avsm@cvs.openbsd.org> | 2006-05-29 16:49:43 +0000 |
|---|---|---|
| committer | Anil Madhavapeddy <avsm@cvs.openbsd.org> | 2006-05-29 16:49:43 +0000 |
| commit | 002c5009a287505e40b1a2edec04999ebcabc98e (patch) | |
| tree | 9bb71d4b289cbb444b9481ddaffb793aa81ff8c4 /etc | |
| parent | cbf986586c3749d9c4d3beff78268497a90c3876 (diff) | |
revert vfs.nfs.privport sysctl, broke a few architectures
requested by deraadt@
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.282 2006/05/28 23:29:32 avsm Exp $ +# $OpenBSD: rc,v 1.283 2006/05/29 16:49:42 avsm Exp $ # System startup script run by init on autoboot # or after single-user. @@ -383,7 +383,7 @@ if [ X"${nfs_server}" = X"YES" -a -s /etc/exports -a \ `sed -e '/^#/d' < /etc/exports | wc -l` -ne 0 ]; then rm -f /var/db/mountdtab echo -n > /var/db/mountdtab - echo -n ' mountd'; mountd ${mountd_flags} + echo -n ' mountd'; mountd echo -n ' nfsd'; nfsd ${nfsd_flags} if [ X"${lockd}" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd diff --git a/etc/rc.conf b/etc/rc.conf index 7b71c6a1449..83316c832d6 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.112 2006/05/28 23:29:32 avsm Exp $ +# $OpenBSD: rc.conf,v 1.113 2006/05/29 16:49:42 avsm Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -82,7 +82,6 @@ savecore_flags= # "-z" to compress ypserv_flags= # E.g. -1 for YP v1, -d for DNS etc yppasswdd_flags=NO # "-d /etc/yp" if passwd files are in /etc/yp nfsd_flags="-tun 4" # Crank the 4 for a busy NFS fileserver -mountd_flags= # "-n" to permit non-reserved port NFS mounts amd_dir=/tmp_mnt # AMD's mount directory amd_master=/etc/amd/master # AMD 'master' map syslogd_flags= # add more flags, ie. "-u -a /chroot/dev/log" |