Browse Source

revert vfs.nfs.privport sysctl, broke a few architectures

requested by deraadt@
OPENBSD_4_0
avsm 18 years ago
parent
commit
159a0297e1
2 changed files with 3 additions and 4 deletions
  1. +2
    -2
      src/etc/rc
  2. +1
    -2
      src/etc/rc.conf

+ 2
- 2
src/etc/rc View File

@ -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 # System startup script run by init on autoboot
# or after single-user. # 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 `sed -e '/^#/d' < /etc/exports | wc -l` -ne 0 ]; then
rm -f /var/db/mountdtab rm -f /var/db/mountdtab
echo -n > /var/db/mountdtab echo -n > /var/db/mountdtab
echo -n ' mountd'; mountd ${mountd_flags}
echo -n ' mountd'; mountd
echo -n ' nfsd'; nfsd ${nfsd_flags} echo -n ' nfsd'; nfsd ${nfsd_flags}
if [ X"${lockd}" = X"YES" ]; then if [ X"${lockd}" = X"YES" ]; then
echo -n ' rpc.lockd'; rpc.lockd echo -n ' rpc.lockd'; rpc.lockd


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

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for normal use: "-q" 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 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 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 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_dir=/tmp_mnt # AMD's mount directory
amd_master=/etc/amd/master # AMD 'master' map amd_master=/etc/amd/master # AMD 'master' map
syslogd_flags= # add more flags, ie. "-u -a /chroot/dev/log" syslogd_flags= # add more flags, ie. "-u -a /chroot/dev/log"


Loading…
Cancel
Save