diff -Naur nfs-utils/nfs.conf.d nfs-utils.new/nfs.conf.d --- nfs-utils/nfs.conf.d 1970-01-01 01:00:00.000000000 +0100 +++ nfs-utils.new/nfs.conf.d 2006-10-22 16:38:30.000000000 +0100 @@ -0,0 +1,12 @@ +# Number of servers to be started up by default +NFSD_OPTS=8 + +# Options to pass to rpc.mountd +# e.g. MOUNTDOPTS="-p 32767" +MOUNTD_OPTS="--no-nfs-version 1 --no-nfs-version 2" +# Options to pass to rpc.statd +# e.g. STATDOPTS="-p 32765 -o 32766" +STATD_OPTS="" +# Options to pass to rpc.rquotad +# e.g. RQUOTADOPTS="-p 32764" +RQUOTAD_OPTS="" diff -Naur nfs-utils/nfsd nfs-utils.new/nfsd --- nfs-utils/nfsd 2003-07-09 03:32:42.000000000 +0100 +++ nfs-utils.new/nfsd 2006-10-22 16:48:08.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash # source application-specific settings -[ -f /etc/conf.d/nfsd ] && . /etc/conf.d/nfsd +[ -f /etc/conf.d/nfs ] && . /etc/conf.d/nfs . /etc/rc.conf . /etc/rc.d/functions @@ -24,7 +24,7 @@ echo "ERROR: nfslock is not running" exit 1 fi - #[ -z "$RQUOTAD_PID" ] && /usr/sbin/rpc.rquotad + #[ -z "$RQUOTAD_PID" ] && /usr/sbin/rpc.rquotad $RQUOTAD_OPTS #if [ $? -gt 0 ]; then # stat_fail # exit 1 diff -Naur nfs-utils/nfsd.conf.d nfs-utils.new/nfsd.conf.d --- nfs-utils/nfsd.conf.d 2003-06-28 06:01:19.000000000 +0100 +++ nfs-utils.new/nfsd.conf.d 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -NFSD_OPTS=8 -MOUNTD_OPTS="--no-nfs-version 1 --no-nfs-version 2" diff -Naur nfs-utils/nfslock nfs-utils.new/nfslock --- nfs-utils/nfslock 2003-06-28 06:01:19.000000000 +0100 +++ nfs-utils.new/nfslock 2006-10-22 16:48:25.000000000 +0100 @@ -1,5 +1,8 @@ #!/bin/bash +# source application-specific settings +[ -f /etc/conf.d/nfs ] && . /etc/conf.d/nfs + . /etc/rc.conf . /etc/rc.d/functions @@ -8,7 +11,7 @@ case "$1" in start) stat_busy "Starting $DAEMON_NAME" - [ -z "$PID" ] && /usr/sbin/rpc.statd + [ -z "$PID" ] && /usr/sbin/rpc.statd $STATD_OPTS if [ $? -gt 0 ]; then stat_fail else --- PKGBUILD.old 2007-02-10 09:58:56.000000000 +0000 +++ PKGBUILD 2007-02-10 09:59:46.000000000 +0000 @@ -14,10 +14,10 @@ nfsd nfslock exports - nfsd.conf.d) + nfs.conf.d) md5sums=('1949634d0dc896696d8a880bdca622c8' '665121e71e7480fcc3ef5dac9e7268d4'\ - 'b1a7f0445c55e8ee3debddcb17f784d0' '24124283a4da2e5f2e0d64e35a63d86d'\ - '1358d29a549dfc37b522c35e823c6813' '2187d0b3a4de7997bd455d96f2e7b268') + '19ac25367b00d8d134d731daabc1bfc6' '94d71cab16bfcd5ed9fc82e3f43ca773'\ + '1358d29a549dfc37b522c35e823c6813' '32db1bbe9312af5fa2f747fe5400eec6') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -29,6 +29,6 @@ install -D -m 755 ../nfsd ${startdir}/pkg/etc/rc.d/nfsd install -D -m 755 ../nfslock ${startdir}/pkg/etc/rc.d/nfslock install -D -m 644 ../exports ${startdir}/pkg/etc/exports - install -D -m 644 ../nfsd.conf.d ${startdir}/pkg/etc/conf.d/nfsd + install -D -m 644 ../nfs.conf.d ${startdir}/pkg/etc/conf.d/nfs mkdir ${startdir}/pkg/var/lib/nfs/v4recovery }