summaryrefslogtreecommitdiff
path: root/testing/nfs-utils
diff options
context:
space:
mode:
Diffstat (limited to 'testing/nfs-utils')
-rw-r--r--testing/nfs-utils/PKGBUILD105
-rw-r--r--testing/nfs-utils/blkmapd.service11
-rw-r--r--testing/nfs-utils/exports15
-rw-r--r--testing/nfs-utils/idmapd.conf14
-rw-r--r--testing/nfs-utils/nfs40
-rw-r--r--testing/nfs-utils/nfs-common315
-rw-r--r--testing/nfs-utils/nfs-common.conf40
-rw-r--r--testing/nfs-utils/nfs-server299
-rw-r--r--testing/nfs-utils/nfs-server.conf29
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch39
-rw-r--r--testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch15
-rw-r--r--testing/nfs-utils/nfs-utils.conf1
-rw-r--r--testing/nfs-utils/nfs-utils.install32
-rw-r--r--testing/nfs-utils/nfsd.service16
-rw-r--r--testing/nfs-utils/proc-fs-nfsd.mount8
-rw-r--r--testing/nfs-utils/rpc-gssd.service12
-rw-r--r--testing/nfs-utils/rpc-idmapd.service12
-rw-r--r--testing/nfs-utils/rpc-mountd.service12
-rw-r--r--testing/nfs-utils/rpc-statd.service12
-rw-r--r--testing/nfs-utils/rpc-svcgssd.service12
-rw-r--r--testing/nfs-utils/start-statd.patch22
-rw-r--r--testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount7
22 files changed, 0 insertions, 1068 deletions
diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD
deleted file mode 100644
index cf92438b4..000000000
--- a/testing/nfs-utils/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 159425 2012-05-24 07:56:08Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
-# Contributor: abelstr <abel@pinklf.eu>
-# Contributor: Marco Lima <cipparello gmail com>
-
-pkgname=nfs-utils
-pkgver=1.2.6
-pkgrel=1
-pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
-url='http://nfs.sourceforge.net'
-license=('GPL')
-backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
- nfs-common
- nfs-common.conf
- nfs-server
- nfs-server.conf
- exports
- idmapd.conf
- start-statd.patch
- nfs
- nfs-utils-1.1.4-mtab-sym.patch
- nfs-utils-1.1.4-no-exec.patch
- rpc-gssd.service
- rpc-mountd.service
- rpc-svcgssd.service
- rpc-idmapd.service
- rpc-statd.service
- nfsd.service
- var-lib-nfs-rpc_pipefs.mount
- proc-fs-nfsd.mount
- blkmapd.service
- nfs-utils.conf)
-install=nfs-utils.install
-md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
- 'dd0d65fc6e8f422fa12520813098264b'
- 'f73f197a16b02c3e248488ec35c4cf43'
- 'e619f18354ff958ed624d05d08853d8f'
- '9cef69bc686cc5dcac23fbb51450747d'
- 'ff585faf410a62c4333a027c50b56bae'
- 'eb4f4027fab6fc1201f1ca04f5954c76'
- 'e9144277a89a620d9bc80413158a7d27'
- 'f5e7bba09a46c5c5d7007cac6eff9df5'
- '7674106eaaa4c149bccd4f05fe3604e9'
- '4f4827dfc93008dfadd0a530ad0872b2'
- '38855936dc55a5afe37d84edc0f11066'
- '965311784d49a7d126d512cadbe91deb'
- 'e05705d9ccccaeaeb1ecaee20adc05bc'
- 'd7df7bc311fd95c5b80017dd1741570d'
- '2e72ee082cba5d3ec6f51d2a105664da'
- '5d33d2e754fd37280365b287603bac90'
- '1cd65909fa0983047f3f06a3ab352401'
- '02a34835aa077146a90eb7d191e612d0'
- '8ffc2ebe932d29efe17d6f3f23d5b975'
- '8ac484023d786766d287ccbe878ae4ba')
-
-build() {
- cd $srcdir/${pkgname}-${pkgver}
- patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
- #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
- # arch specific patch
- patch -Np0 -i $srcdir/start-statd.patch
-
- ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
- --without-tcp-wrappers --with-statedir=/var/lib/nfs \
- --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
- --enable-mountconfig
-
- make
-}
-
-package() {
- cd $srcdir/${pkgname}-${pkgver}
- # fix make install
- mkdir -p $pkgdir/sbin
- make DESTDIR=$pkgdir install
-
- # support python2 (FS#25120)
- sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
-
- # NFS & NFSv4 init scripts
- install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
- install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
- # Configuration
- install -D -m 644 ../exports "$pkgdir/"etc/exports
- install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
- install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
- install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
- install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
- install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
- # systemd files
- for i in ${srcdir}/*.{service,mount}; do
- install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
- done
- install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
- # directories
- mkdir "$pkgdir/"etc/exports.d
- mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
- mkdir "$pkgdir/"var/lib/nfs/v4recovery
-}
diff --git a/testing/nfs-utils/blkmapd.service b/testing/nfs-utils/blkmapd.service
deleted file mode 100644
index 16cb68bbb..000000000
--- a/testing/nfs-utils/blkmapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/blkmapd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports
deleted file mode 100644
index 8f4aac598..000000000
--- a/testing/nfs-utils/exports
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/exports
-#
-# List of directories exported to NFS clients. See exports(5).
-# Use exportfs -arv to reread.
-#
-# Example for NFSv2 and NFSv3:
-# /srv/home hostname1(rw,sync) hostname2(ro,sync)
-#
-# Example for NFSv4:
-# /srv/nfs4 hostname1(rw,sync,fsid=0)
-# /srv/nfs4/home hostname1(rw,sync,nohide)
-# Using Kerberos and integrity checking:
-# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt)
-# /srv/nfs4/home gss/krb5i(rw,sync,nohide)
-#
diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf
deleted file mode 100644
index b1b23afe9..000000000
--- a/testing/nfs-utils/idmapd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[General]
-
-Verbosity = 0
-Pipefs-Directory = /var/lib/nfs/rpc_pipefs
-Domain = localdomain
-
-[Mapping]
-
-Nobody-User = nobody
-Nobody-Group = nobody
-
-[Translation]
-
-Method = nsswitch
diff --git a/testing/nfs-utils/nfs b/testing/nfs-utils/nfs
deleted file mode 100644
index 2d33cf3d4..000000000
--- a/testing/nfs-utils/nfs
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Optinal options passed to rquotad
-RPCRQUOTADOPTS=""
-#
-# Optional arguments passed to in-kernel lockd
-#LOCKDARG=
-# TCP port rpc.lockd should listen on.
-#LOCKD_TCPPORT=32803
-# UDP port rpc.lockd should listen on.
-#LOCKD_UDPPORT=32769
-#
-# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
-RPCNFSDARGS=""
-# Number of nfs server processes to be started.
-# The default is 8.
-RPCNFSDCOUNT=8
-# Set V4 grace period in seconds
-#NFSD_V4_GRACE=90
-#
-# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
-RPCMOUNTDOPTS=""
-#
-# Optional arguments passed to rpc.statd. See rpc.statd(8)
-STATDARG=""
-#
-# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
-RPCIDMAPDARGS=""
-#
-# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
-RPCGSSDARGS=""
-#
-# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
-RPCSVCGSSDARGS=""
-#
-# To enable RDMA support on the server by setting this to
-# the port the server should listen on
-#RDMA_PORT=20049
-#
-# Optional arguments passed to blkmapd. See blkmapd(8)
-BLKMAPDARGS=""
diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common
deleted file mode 100644
index 7b16b4b3c..000000000
--- a/testing/nfs-utils/nfs-common
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-common
-
-NEED_STATD=
-STATD_OPTS=
-NEED_IDMAPD=
-IDMAPD_OPTS=
-NEED_GSSD=
-GSSD_OPTS=
-PIPEFS_MOUNTPOINT=
-PIPEFS_MOUNTOPTS=
-
-# rpc.statd daemon & binary location
-STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.gssd daemon & binary location
-GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default mountpoint and options for rpc_pipefs filesystem
-[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs"
-[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults"
-
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
-# /etc/conf.d/nfs-common settings, if any, will override our autodetection.)
-AUTO_NEED_IDMAPD=no
-AUTO_NEED_GSSD=no
-
-if [ -f /etc/fstab ]; then
- exec 9<&0 </etc/fstab
-
- while read DEV MTPT FSTYPE OPTS REST; do
- if [ "$FSTYPE" = "nfs4" ]; then
- AUTO_NEED_IDMAPD=yes
- fi
- case "$OPTS" in
- sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
- AUTO_NEED_GSSD=yes
- ;;
- esac
- done
-
- exec 0<&9 9<&-
-fi
-
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
- AUTO_NEED_IDMAPD=yes
-fi
-
-case "$NEED_STATD" in
- yes|no)
- ;;
- *)
- NEED_STATD=yes
- ;;
-esac
-
-case "$NEED_IDMAPD" in
- yes|no)
- ;;
- *)
- NEED_IDMAPD=$AUTO_NEED_IDMAPD
- ;;
-esac
-
-case "$NEED_GSSD" in
- yes|no)
- ;;
- *)
- NEED_GSSD=$AUTO_NEED_GSSD
- ;;
-esac
-
-do_modprobe() {
- if [ -x /sbin/modprobe -a -f /proc/modules ]; then
- modprobe -q "$1" || true
- fi
-}
-
-do_mount() {
- if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
- return 1
- fi
-
- if grep -vw "$1" /proc/mounts &> /dev/null ; then
- if ! mountpoint -q "$2" ; then
- mount -t "$1" "$1" "$2" -o "$3"
- return
- fi
- fi
- return 0
-}
-
-do_umount() {
- if mountpoint -q "$1" ; then
- umount "$1"
- fi
- return 0
-}
-
-get_pid() {
- pidof -o %PPID "$1"
-}
-
-case "$1" in
- start)
- ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
- rc=0
- if [ "$NEED_STATD" = yes ]; then
- stat_busy "Starting $STATD_DAEMON_NAME daemon"
- PID=$(get_pid $STATD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid
- # RUN
- $STATD $STATD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- # Run sm-notify
- /usr/sbin/sm-notify $SMNOTIFY_OPTS
- fi
-
- if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
- stat_busy "Mounting pipefs filesystem"
- do_modprobe sunrpc
- do_modprobe nfs
- do_modprobe nfsd
- do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS"
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- if [ "$NEED_IDMAPD" = yes ]; then
- stat_busy "Starting $IDMAPD_DAEMON_NAME daemon"
- PID=$(get_pid $IDMAPD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid
- # RUN
- $IDMAPD $IDMAPD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- fi
-
- if [ "$NEED_GSSD" = yes ]; then
- do_modprobe rpcsec_gss_krb5
- stat_busy "Starting $GSSD_DAEMON_NAME daemon"
- PID=$(get_pid $GSSD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid
- # RUN
- $GSSD $GSSD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- fi
- fi
-
- add_daemon $daemon_name
- ;;
-
- stop)
- rc=0
- if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-
- if [ "$NEED_GSSD" = yes ]; then
- stat_busy "Stopping $GSSD_DAEMON_NAME daemon"
- PID=$(get_pid $GSSD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
-
- if [ "$NEED_IDMAPD" = yes ]; then
- stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon"
- PID=$(get_pid $IDMAPD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
- do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true
- fi
-
- if [ "$NEED_STATD" = yes ]; then
- stat_busy "Stopping $STATD_DAEMON_NAME daemon"
- PID=$(get_pid $STATD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
-
- rm_daemon $daemon_name
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
-
- if [ "$NEED_STATD" = yes ]; then
- stat_busy "Daemon $STATD_DAEMON_NAME running"
- PID=$(get_pid $STATD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
-
- if [ "$NEED_GSSD" = yes ]; then
- stat_busy "Daemon $GSSD_DAEMON_NAME running"
- PID=$(get_pid $GSSD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
-
- if [ "$NEED_IDMAPD" = yes ]; then
- stat_busy "Daemon $IDMAPD_DAEMON_NAME running"
- PID=$(get_pid $IDMAPD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
- echo
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|status|restart}"
-esac
-exit 0
-
diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf
deleted file mode 100644
index 12466b3e5..000000000
--- a/testing/nfs-utils/nfs-common.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Parameters to be passed to nfs-common (nfs clients & server) init script.
-#
-
-# If you do not set values for the NEED_ options, they will be attempted
-# autodetected; this should be sufficient for most people. Valid alternatives
-# for the NEED_ options are "yes" and "no".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=""
-
-# Options to pass to rpc.statd.
-# See rpc.statd(8) for more details.
-# N.B. statd normally runs on both client and server, and run-time
-# options should be specified accordingly.
-# STATD_OPTS="-p 32765 -o 32766"
-STATD_OPTS=""
-
-# Options to pass to sm-notify
-# e.g. SMNOTIFY_OPTS="-p 32764"
-SMNOTIFY_OPTS=""
-
-# Do you want to start the idmapd daemon? It is only needed for NFSv4.
-NEED_IDMAPD=""
-
-# Options to pass to rpc.idmapd.
-# See rpc.idmapd(8) for more details.
-IDMAPD_OPTS=""
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=""
-
-# Options to pass to rpc.gssd.
-# See rpc.gssd(8) for more details.
-GSSD_OPTS=""
-
-# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
-PIPEFS_MOUNTPOINT=""
-
-# Options used to mount rpc_pipefs filesystem; the default is "defaults".
-PIPEFS_MOUNTOPTS=""
diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server
deleted file mode 100644
index 6aa609d8c..000000000
--- a/testing/nfs-utils/nfs-server
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-server
-
-NFSD_COUNT=
-NFSD_OPTS=
-NEED_SVCGSSD=
-SVCGSSD_OPTS=
-MOUNTD_OPTS=
-PROCNFSD_MOUNTPOINT=
-PROCNFSD_MOUNTOPTS=
-
-# rpc.nfsd daemon & binary location
-NFSD_PROCESS_NAME=nfsd
-NFSD_DAEMON_NAME=rpc.nfsd
-NFSD="/usr/sbin/rpc.nfsd"
-
-# rpc.svcgssd daemon & binary location
-SVCGSSD_DAEMON_NAME=rpc.svcgssd
-SVCGSSD="/usr/sbin/rpc.svcgssd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.mountd daemon & binary location
-MOUNTD_DAEMON_NAME=rpc.mountd
-MOUNTD="/usr/sbin/rpc.mountd"
-
-# exortfs binary location
-EXPORTFS="/usr/sbin/exportfs"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default number of nfsd servers
-[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8
-
-# Default mountpoint and options for nfsd filesystem
-[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd"
-[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
-
-case "$NEED_SVCGSSD" in
- yes|no)
- ;;
- *)
- NEED_SVCGSSD=no
- ;;
-esac
-
-do_modprobe() {
- if [ -x /sbin/modprobe -a -f /proc/modules ]; then
- modprobe -q "$1" || true
- fi
-}
-
-do_mount() {
- if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
- return 1
- fi
-
- if grep -vw "$1" /proc/mounts &> /dev/null ; then
- if ! mountpoint -q "$2" ; then
- mount -t "$1" "$1" "$2" -o "$3"
- return
- fi
- fi
- return 0
-}
-
-do_umount() {
- if mountpoint -q "$1" ; then
- umount "$1"
- fi
- return 0
-}
-
-get_pid() {
- pidof -o %PPID "$1"
-}
-
-case "$1" in
- start)
- ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
- rc=0
- stat_busy "Mounting nfsd filesystem"
- do_modprobe nfsd
- do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- stat_busy "Exporting all directories"
- $EXPORTFS -r
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- stat_busy "Starting $NFSD_DAEMON_NAME daemon"
- PID=$(get_pid $NFSD_PROCESS_NAME)
- if [ -z "$PID" ]; then
- [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid
- # RUN
- $NFSD $NFSD_OPTS $NFSD_COUNT
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
-
- if [ "$NEED_SVCGSSD" = yes ]; then
- do_modprobe rpcsec_gss_krb5
- stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon"
- PID=$(get_pid $SVCGSSD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid
- # RUN
- $SVCGSSD $SVCGSSD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- fi
-
- PID=$(get_pid $IDMAPD)
- [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null
-
- stat_busy "Starting $MOUNTD_DAEMON_NAME daemon"
- PID=$(get_pid $MOUNTD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid
- # RUN
- $MOUNTD $MOUNTD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
-
- add_daemon $daemon_name
- ;;
-
- stop)
- rc=0
- stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon"
- PID=$(get_pid $MOUNTD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
-
- if [ "$NEED_SVCGSSD" = yes ]; then
- stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon"
- PID=$(get_pid $SVCGSSD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
-
- stat_busy "Stopping $NFSD_DAEMON_NAME daemon"
- PID=$(get_pid $NFSD_PROCESS_NAME)
- # KILL (SIGINT)
- [ ! -z "$PID" ] && kill -2 $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- sleep 1
- PID=$(get_pid $NFSD_PROCESS_NAME)
- # KILL (KILL) - just to be sure
- [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
- #
- rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
-
- stat_busy "Unexporting all directories"
- $EXPORTFS -au
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- # flush everything out of the kernels export table
- if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then
- $EXPORTFS -f
- fi
- do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true
- rm_daemon $daemon_name
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
-
- stat_busy "Daemon $NFSD_DAEMON_NAME running"
- PID=$(get_pid $NFSD_PROCESS_NAME)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
-
- stat_busy "Daemon $MOUNTD_DAEMON_NAME running"
- PID=$(get_pid $MOUNTD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
-
- if [ "$NEED_SVCGSSD" = yes ]; then
- stat_busy "Daemon $SVCGSSD_DAEMON_NAME running"
- PID=$(get_pid $SVCGSSD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
- echo
- ;;
-
- reload)
- rc=0
- stat_busy "Re-exporting all directories"
- $EXPORTFS -r
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|status|reload|restart}"
-esac
-exit 0
diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf
deleted file mode 100644
index 581e26350..000000000
--- a/testing/nfs-utils/nfs-server.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Parameters to be passed to nfs-server init script.
-#
-
-# Options to pass to rpc.nfsd.
-# See rpc.nfsd(8) for more details.
-NFSD_OPTS=""
-
-# Number of servers to start up; the default is 8 servers.
-NFSD_COUNT=""
-
-# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
-PROCNFSD_MOUNTPOINT=""
-
-# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
-PROCNFSD_MOUNTOPTS=""
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option.
-# See rpc.mountd(8) for more details.
-MOUNTD_OPTS=""
-
-# Do you want to start the svcgssd daemon? It is only required for Kerberos
-# exports. Valid alternatives are "yes" and "no"; the default is "no".
-NEED_SVCGSSD=""
-
-# Options to pass to rpc.svcgssd.
-# See rpc.svcgssd(8) for more details.
-SVCGSSD_OPTS=""
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
deleted file mode 100644
index c9e60afc7..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- return var_mtab_does_not_exist;
- }
-
--static int
-+int
- mtab_is_a_symlink(void) {
- get_mtab_info();
- return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
-
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- int flags;
- mntFILE *mfp;
-
-+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+ that would create a file /proc/mounts in case the proc filesystem
-+ is not mounted, and the fchmod below would also fail. */
-+ if (mtab_is_a_symlink()) {
-+ return EX_SUCCESS;
-+ }
-+
- lock_mtab();
-
- mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
deleted file mode 100644
index ea50a21d8..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.2/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -381,10 +381,6 @@
- mount_error(NULL, mount_point, ENOTDIR);
- return 1;
- }
-- if (access(mount_point, X_OK) < 0) {
-- mount_error(NULL, mount_point, errno);
-- return 1;
-- }
-
- return 0;
- }
diff --git a/testing/nfs-utils/nfs-utils.conf b/testing/nfs-utils/nfs-utils.conf
deleted file mode 100644
index 33c97b838..000000000
--- a/testing/nfs-utils/nfs-utils.conf
+++ /dev/null
@@ -1 +0,0 @@
-nfs
diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install
deleted file mode 100644
index 7dcdf9575..000000000
--- a/testing/nfs-utils/nfs-utils.install
+++ /dev/null
@@ -1,32 +0,0 @@
-## arg 1: the new package version
-post_install() {
-cat << 'EOM'
- ==> PLEASE NOTE:
- ==> Extended configuration options for NFS (clients & server) are available in
- ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
- ==>
- ==> Please refer to http://wiki.archlinux.org/index.php/Nfs
- ==> for further information on NFS; for NFSv4, refer to
- ==> http://wiki.archlinux.org/index.php/NFSv4
-EOM
-}
-
-## arg 1: the new package version
-## arg 2: the old package version
-post_upgrade() {
- if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
-cat << 'EOM'
- ==> IMPORTANT NFS UTILS CHANGES:
- ==> This is a rather important upgrade, you are going to have to change config files.
- ==> /etc/rc.conf daemons changes:
- ==> Change portmap to rpcbind
- ==> Change nfslock to nfs-common
- ==> Change nfsd to nfs-server
- ==>
- ==> Extended configuration options for NFS (clients & server) are available in:
- ==> /etc/conf.d/nfs-common
- ==> /etc/conf.d/nfs-server
- ==> Please change them to your needs.
-EOM
- fi
-}
diff --git a/testing/nfs-utils/nfsd.service b/testing/nfs-utils/nfsd.service
deleted file mode 100644
index e5481c3d1..000000000
--- a/testing/nfs-utils/nfsd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/proc-fs-nfsd.mount b/testing/nfs-utils/proc-fs-nfsd.mount
deleted file mode 100644
index f8664a8be..000000000
--- a/testing/nfs-utils/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=rpc_pipefs
diff --git a/testing/nfs-utils/rpc-gssd.service b/testing/nfs-utils/rpc-gssd.service
deleted file mode 100644
index 446864d18..000000000
--- a/testing/nfs-utils/rpc-gssd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=RPC GSS-API client-side daemon
-After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-idmapd.service b/testing/nfs-utils/rpc-idmapd.service
deleted file mode 100644
index 72cd26a93..000000000
--- a/testing/nfs-utils/rpc-idmapd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv4 ID-name mapping daemon
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-mountd.service b/testing/nfs-utils/rpc-mountd.service
deleted file mode 100644
index edd8c851d..000000000
--- a/testing/nfs-utils/rpc-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-statd.service b/testing/nfs-utils/rpc-statd.service
deleted file mode 100644
index 983b4044f..000000000
--- a/testing/nfs-utils/rpc-statd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.statd $STATD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-svcgssd.service b/testing/nfs-utils/rpc-svcgssd.service
deleted file mode 100644
index 8152e8338..000000000
--- a/testing/nfs-utils/rpc-svcgssd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=RPC GSS-API server-side daemon
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch
deleted file mode 100644
index 5d73b6e35..000000000
--- a/testing/nfs-utils/start-statd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100
-+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100
-@@ -1,9 +1,16 @@
--#!/bin/bash -p
-+#!/bin/sh
-+
-+# Original script provided by the NFS project
-+# Modified for Arch Linux by Tom Killian
-+
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
- # /var/run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
--PATH=/sbin:/usr/sbin
--exec rpc.statd --no-notify
-+
-+# source application-specific settings
-+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf
-+
-+exec /usr/sbin/rpc.statd $STATD_OPTS
-
diff --git a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index 4bd440f24..000000000
--- a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=RPC pipe filesystem
-
-[Mount]
-What=rpc_pipefs
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs