[arch-commits] Commit in nfs-utils/trunk (13 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Apr 16 06:03:07 UTC 2012
Date: Monday, April 16, 2012 @ 02:03:07
Author: tpowa
Revision: 156211
upgpkg: nfs-utils 1.2.5-3
add systemd files, added mountoptions
Added:
nfs-utils/trunk/nfs
nfs-utils/trunk/nfs-blkmap.service
nfs-utils/trunk/nfs-lock.preconfig
nfs-utils/trunk/nfs-lock.service
nfs-utils/trunk/nfs-secure-server.preconfig
nfs-utils/trunk/nfs-secure-server.service
nfs-utils/trunk/nfs-secure.service
nfs-utils/trunk/nfs-server.postconfig
nfs-utils/trunk/nfs-server.preconfig
nfs-utils/trunk/nfs-server.service
nfs-utils/trunk/proc-fs-nfsd.mount
nfs-utils/trunk/var-lib-nfs-rpc_pipefs.mount
Modified:
nfs-utils/trunk/PKGBUILD
------------------------------+
PKGBUILD | 52 ++++++++++++++++++++++++++++++++++++++---
nfs | 40 +++++++++++++++++++++++++++++++
nfs-blkmap.service | 12 +++++++++
nfs-lock.preconfig | 20 +++++++++++++++
nfs-lock.service | 18 ++++++++++++++
nfs-secure-server.preconfig | 7 +++++
nfs-secure-server.service | 14 +++++++++++
nfs-secure.service | 12 +++++++++
nfs-server.postconfig | 18 ++++++++++++++
nfs-server.preconfig | 10 +++++++
nfs-server.service | 21 ++++++++++++++++
proc-fs-nfsd.mount | 8 ++++++
var-lib-nfs-rpc_pipefs.mount | 8 ++++++
13 files changed, 237 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-04-16 05:00:04 UTC (rev 156210)
+++ PKGBUILD 2012-04-16 06:03:07 UTC (rev 156211)
@@ -12,7 +12,7 @@
arch=('i686' 'x86_64')
url='http://nfs.sourceforge.net'
license=('GPL')
-backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
+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
@@ -23,10 +23,23 @@
exports
idmapd.conf
start-statd.patch
+ nfs
+ nfs-server.service
+ nfs-server.postconfig
+ nfs-server.preconfig
+ nfs-blkmap.service
+ nfs-secure-server.service
+ nfs-secure-server.preconfig
+ nfs-lock.service
+ nfs-lock.preconfig
+ nfs-secure.service
+ proc-fs-nfsd.mount
+ var-lib-nfs-rpc_pipefs.mount
nfs-utils-1.1.4-mtab-sym.patch
nfs-utils-1.1.4-no-exec.patch)
install=nfs-utils.install
+
build() {
cd $srcdir/${pkgname}-${pkgver}
patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
@@ -34,9 +47,10 @@
# arch specific patch
patch -Np0 -i $srcdir/start-statd.patch
- ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
+ ./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-ipv6 --sysconfdir=/etc --enable-libmount-mount \
+ --enable-mountconfig
make
}
@@ -56,8 +70,40 @@
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/$(basename $i)
+ done
+ install -D -m 755 ../nfs-server.preconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-server.preconfig
+ install -D -m 755 ../nfs-server.postconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-server.postconfig
+ install -D -m 755 ../nfs-lock.preconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-lock.preconfig
+ install -D -m 755 ../nfs-secure-server.preconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-secure-server.preconfig
# directories
mkdir "$pkgdir/"etc/exports.d
mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
mkdir "$pkgdir/"var/lib/nfs/v4recovery
}
+md5sums=('8395ac770720b83c5c469f88306d7765'
+ 'dd0d65fc6e8f422fa12520813098264b'
+ 'f73f197a16b02c3e248488ec35c4cf43'
+ 'e619f18354ff958ed624d05d08853d8f'
+ '9cef69bc686cc5dcac23fbb51450747d'
+ 'ff585faf410a62c4333a027c50b56bae'
+ 'eb4f4027fab6fc1201f1ca04f5954c76'
+ 'e9144277a89a620d9bc80413158a7d27'
+ 'f5e7bba09a46c5c5d7007cac6eff9df5'
+ '630a8ae10036bd1ffc6b6780fcd43403'
+ '956d5b8a9476cedc9fec322b9635a169'
+ '44c6bc21fca29b37de5cc689c3166ad1'
+ '23551447a1a4505ebc4e4919c08f142a'
+ 'ff803f282aa2532c016ed149f9579d2f'
+ 'c2995ec2e6e0158f15b01f9e20ce706b'
+ '218837aa129989146de8cbbf7c95ee5c'
+ '6a6e8befc9700d9f93949b7e12f38fa4'
+ '864178f2e13e077c76eec1003b4f662a'
+ '8f1b5282795895c9b8ce8430d20cdda6'
+ '4cb9d4277577c9e93e347e5855501e33'
+ '7674106eaaa4c149bccd4f05fe3604e9'
+ '4f4827dfc93008dfadd0a530ad0872b2')
Added: nfs
===================================================================
--- nfs (rev 0)
+++ nfs 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,40 @@
+#
+# 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=""
Added: nfs-blkmap.service
===================================================================
--- nfs-blkmap.service (rev 0)
+++ nfs-blkmap.service 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,12 @@
+[Unit]
+Description=pNFS block layout mapping daemon
+Wants=var-lib-nfs-rpc_pipefs.mount
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/conf.d/nfs
+ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
+
+[Install]
+WantedBy=multi-user.target
Added: nfs-lock.preconfig
===================================================================
--- nfs-lock.preconfig (rev 0)
+++ nfs-lock.preconfig 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. /etc/conf.d/nfs
+
+# Make sure nfs module is loaded
+/sbin/modprobe -q nfs
+
+# Make sure lockd is loaded
+/sbin/modprobe -q lockd $LOCKDARG
+
+# See if the kernel lockd should start up
+# listening on a particular port
+#
+if [ -n "$LOCKD_TCPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
+fi
+if [ -n "$LOCKD_UDPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
+fi
+
Added: nfs-lock.service
===================================================================
--- nfs-lock.service (rev 0)
+++ nfs-lock.service 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,18 @@
+[Unit]
+Description=NFS file locking service.
+Requires=rpcbind.service network.target
+After=network.target named.service rpcbind.service
+Wants=remote-fs-pre.target
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+StandardError=syslog+console
+EnvironmentFile=-/etc/conf.d/nfs
+ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-lock.preconfig
+ExecStart=/usr/sbin/rpc.statd $STATDARG
+# Make sure lockd's ports are reset
+ExecStopPost=-/sbin/sysctl -w fs.nfs.nlm_tcpport=0 fs.nfs.nlm_udpport=0
+
+[Install]
+WantedBy=multi-user.target
Added: nfs-secure-server.preconfig
===================================================================
--- nfs-secure-server.preconfig (rev 0)
+++ nfs-secure-server.preconfig 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. /etc/conf.d/nfs
+
+# Make sure rpcsec_gss_krb5 module is loaded
+/sbin/modprobe -q rpcsec_gss_krb5
+
Added: nfs-secure-server.service
===================================================================
--- nfs-secure-server.service (rev 0)
+++ nfs-secure-server.service 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Secure NFS Server
+Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
+After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/conf.d/nfs
+ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-secure-server.preconfig
+ExecStart=/usr/sbin/rpc.svcgssd $RPCSVCGSSDARGS
+
+[Install]
+WantedBy=multi-user.target
+
Added: nfs-secure.service
===================================================================
--- nfs-secure.service (rev 0)
+++ nfs-secure.service 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Secure NFS
+Requires=var-lib-nfs-rpc_pipefs.mount
+After=syslog.target var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/conf.d/nfs
+ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS
+
+[Install]
+WantedBy=multi-user.target
Added: nfs-server.postconfig
===================================================================
--- nfs-server.postconfig (rev 0)
+++ nfs-server.postconfig 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /etc/conf.d/nfs
+
+# Tell idmapd the server is up and running
+/usr/bin/pkill -HUP rpc.idmapd
+
+#
+# Enabled the RDMA server support if configured to do so.
+#
+# Load the module and then enable the server to listen
+# on the given port
+if [ -n "$RDMA_PORT" ]; then
+ /sbin/modprobe svcrdma
+ echo "rdma $RDMA_PORT" > /proc/fs/nfsd/portlist
+fi
+
+exit 0
Added: nfs-server.preconfig
===================================================================
--- nfs-server.preconfig (rev 0)
+++ nfs-server.preconfig 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. /etc/conf.d/nfs
+
+# Set v4 grace period if requested
+if [ -n "$NFSD_V4_GRACE" ]; then
+ echo "$NFSD_V4_GRACE" > /proc/fs/nfsd/nfsv4gracetime
+fi
+
+exit 0
Added: nfs-server.service
===================================================================
--- nfs-server.service (rev 0)
+++ nfs-server.service 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,21 @@
+[Unit]
+Description=NFS Server
+Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
+After=network.target named.service rpcbind.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/conf.d/nfs
+ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-server.preconfig
+ExecStartPre=-/usr/sbin/rpc.rquotad $RPCRQUOTADOPTS
+ExecStartPre=/usr/sbin/exportfs -r
+ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS ${RPCNFSDCOUNT}
+ExecStartPost=/usr/sbin/rpc.mountd $RPCMOUNTDOPTS
+ExecStartPost=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS
+ExecStartPost=-/usr/lib/nfs-utils/scripts/nfs-server.postconfig
+ExecStop=/usr/sbin/rpc.nfsd 0
+ExecStopPost=/usr/sbin/exportfs -f
+
+[Install]
+WantedBy=multi-user.target
+
Added: proc-fs-nfsd.mount
===================================================================
--- proc-fs-nfsd.mount (rev 0)
+++ proc-fs-nfsd.mount 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPC Pipe File System
+DefaultDependencies=no
+
+[Mount]
+What=sunrpc
+Where=/proc/fs/nfsd
+Type=nfsd
Added: var-lib-nfs-rpc_pipefs.mount
===================================================================
--- var-lib-nfs-rpc_pipefs.mount (rev 0)
+++ var-lib-nfs-rpc_pipefs.mount 2012-04-16 06:03:07 UTC (rev 156211)
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPC Pipe File System
+DefaultDependencies=no
+
+[Mount]
+What=sunrpc
+Where=/var/lib/nfs/rpc_pipefs
+Type=rpc_pipefs
More information about the arch-commits
mailing list