[arch-commits] Commit in nfs-utils/repos (22 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Mar 11 07:19:57 UTC 2015
Date: Wednesday, March 11, 2015 @ 08:19:57
Author: tpowa
Revision: 233337
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nfs-utils/repos/testing-i686/
nfs-utils/repos/testing-i686/PKGBUILD
(from rev 233336, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-i686/exports
(from rev 233336, nfs-utils/trunk/exports)
nfs-utils/repos/testing-i686/id_resolver.conf
(from rev 233336, nfs-utils/trunk/id_resolver.conf)
nfs-utils/repos/testing-i686/nfs-common.conf
(from rev 233336, nfs-utils/trunk/nfs-common.conf)
nfs-utils/repos/testing-i686/nfs-server.conf
(from rev 233336, nfs-utils/trunk/nfs-server.conf)
nfs-utils/repos/testing-i686/nfs-utils-1.3.2-statd-bg.patch
(from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch)
nfs-utils/repos/testing-i686/nfs-utils-1.3.2-statd-nowait.patch
(from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-nowait.patch)
nfs-utils/repos/testing-i686/nfs-utils.conf
(from rev 233336, nfs-utils/trunk/nfs-utils.conf)
nfs-utils/repos/testing-i686/nfs-utils.install
(from rev 233336, nfs-utils/trunk/nfs-utils.install)
nfs-utils/repos/testing-i686/nfs-utils_env.sh
(from rev 233336, nfs-utils/trunk/nfs-utils_env.sh)
nfs-utils/repos/testing-x86_64/
nfs-utils/repos/testing-x86_64/PKGBUILD
(from rev 233336, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-x86_64/exports
(from rev 233336, nfs-utils/trunk/exports)
nfs-utils/repos/testing-x86_64/id_resolver.conf
(from rev 233336, nfs-utils/trunk/id_resolver.conf)
nfs-utils/repos/testing-x86_64/nfs-common.conf
(from rev 233336, nfs-utils/trunk/nfs-common.conf)
nfs-utils/repos/testing-x86_64/nfs-server.conf
(from rev 233336, nfs-utils/trunk/nfs-server.conf)
nfs-utils/repos/testing-x86_64/nfs-utils-1.3.2-statd-bg.patch
(from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch)
nfs-utils/repos/testing-x86_64/nfs-utils-1.3.2-statd-nowait.patch
(from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-nowait.patch)
nfs-utils/repos/testing-x86_64/nfs-utils.conf
(from rev 233336, nfs-utils/trunk/nfs-utils.conf)
nfs-utils/repos/testing-x86_64/nfs-utils.install
(from rev 233336, nfs-utils/trunk/nfs-utils.install)
nfs-utils/repos/testing-x86_64/nfs-utils_env.sh
(from rev 233336, nfs-utils/trunk/nfs-utils_env.sh)
---------------------------------------------------+
testing-i686/PKGBUILD | 94 ++++++++++++++++++++
testing-i686/exports | 12 ++
testing-i686/id_resolver.conf | 9 +
testing-i686/nfs-common.conf | 22 ++++
testing-i686/nfs-server.conf | 17 +++
testing-i686/nfs-utils-1.3.2-statd-bg.patch | 25 +++++
testing-i686/nfs-utils-1.3.2-statd-nowait.patch | 35 +++++++
testing-i686/nfs-utils.conf | 1
testing-i686/nfs-utils.install | 28 +++++
testing-i686/nfs-utils_env.sh | 20 ++++
testing-x86_64/PKGBUILD | 94 ++++++++++++++++++++
testing-x86_64/exports | 12 ++
testing-x86_64/id_resolver.conf | 9 +
testing-x86_64/nfs-common.conf | 22 ++++
testing-x86_64/nfs-server.conf | 17 +++
testing-x86_64/nfs-utils-1.3.2-statd-bg.patch | 25 +++++
testing-x86_64/nfs-utils-1.3.2-statd-nowait.patch | 35 +++++++
testing-x86_64/nfs-utils.conf | 1
testing-x86_64/nfs-utils.install | 28 +++++
testing-x86_64/nfs-utils_env.sh | 20 ++++
20 files changed, 526 insertions(+)
Copied: nfs-utils/repos/testing-i686/PKGBUILD (from rev 233336, nfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+# Contributor: abelstr <abel at pinklf.eu>
+# Contributor: Marco Lima <cipparello gmail com>
+
+pkgname=nfs-utils
+pkgver=1.3.2
+pkgrel=6
+pkgdesc="Support programs for Network File Systems"
+arch=('i686' 'x86_64')
+url='http://nfs.sourceforge.net'
+license=('GPL2')
+backup=(etc/{exports,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
+depends=('rpcbind' 'librpcsecgss>=0.19-2' 'nfsidmap' 'gssproxy'
+ 'libevent>=2.0.10' 'device-mapper')
+makedepends=('sqlite')
+source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{bz2,sign}
+ nfs-common.conf nfs-server.conf exports nfs-utils.conf id_resolver.conf
+ nfs-utils_env.sh
+ nfs-utils-1.3.2-statd-bg.patch
+ nfs-utils-1.3.2-statd-nowait.patch)
+install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage'
+ 'python2: for nfsiostat and mountstats usage')
+md5sums=('1e2f3c1ed468dee02d00c534c002ea10'
+ 'SKIP'
+ '95129639a19da1f262d4eb3ac73e0bdb'
+ '7bd61e84ee05054f5232b2e8063ea08d'
+ 'e6ad3c7a59c7e4c24965a0e7da35026c'
+ '8ac484023d786766d287ccbe878ae4ba'
+ '2e203f35ee753f5264a951cf43d4168e'
+ 'c6c9c32f153dfa6c0477ea6b99354288'
+ '45f55a5d581b2527b453c3a0816add24'
+ 'dde4e23776a2425d2a1241eb2daf8b7c')
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix rpc.statd starting
+ patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-bg.patch
+ # don't wait for online target on statd
+ patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-nowait.patch
+
+ # fix hardcoded sbin path to our needs
+ sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+ autoreconf -vfi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-gss \
+ --without-tcp-wrappers \
+ --with-statedir=/var/lib/nfs \
+ --enable-ipv6 \
+ --enable-libmount-mount \
+ --enable-mountconfig \
+ --with-start-statd=/usr/bin/start-statd
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make -k check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir" install
+
+ sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
+
+ install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
+
+ for i in systemd/{*.service,*.mount,*.target}; do
+ install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$(basename $i)
+ done
+
+ cd ..
+ 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 755 nfs-utils_env.sh "$pkgdir"/usr/lib/systemd/scripts/nfs-utils_env.sh
+ install -D -m 644 exports "$pkgdir"/etc/exports
+ install -D -m 644 id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf
+ install -D -m 644 nfs-utils.conf "$pkgdir"/usr/lib/modules-load.d/nfs-utils.conf
+ mkdir "$pkgdir"/etc/exports.d
+ mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs
+ mkdir "$pkgdir"/var/lib/nfs/v4recovery
+}
Copied: nfs-utils/repos/testing-i686/exports (from rev 233336, nfs-utils/trunk/exports)
===================================================================
--- testing-i686/exports (rev 0)
+++ testing-i686/exports 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,12 @@
+# /etc/exports - exports(5) - directories exported to NFS clients
+#
+# 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 *(rw,sync,sec=krb5i,fsid=0)
+# /srv/nfs4/home *(rw,sync,sec=krb5i,nohide)
+#
+# Use `exportfs -arv` to reload.
Copied: nfs-utils/repos/testing-i686/id_resolver.conf (from rev 233336, nfs-utils/trunk/id_resolver.conf)
===================================================================
--- testing-i686/id_resolver.conf (rev 0)
+++ testing-i686/id_resolver.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,9 @@
+#
+# nfsidmap(5) - The NFS idmapper upcall program
+# Summary: Used by NFSv4 to map user/group ids into
+# user/group names and names into in ids
+# Options:
+# -v Increases the verbosity of the output to syslog
+# -t timeout Set the expiration timer, in seconds, on the key
+#
+create id_resolver * * /usr/bin/nfsidmap %k %d
Copied: nfs-utils/repos/testing-i686/nfs-common.conf (from rev 233336, nfs-utils/trunk/nfs-common.conf)
===================================================================
--- testing-i686/nfs-common.conf (rev 0)
+++ testing-i686/nfs-common.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,22 @@
+# Parameters to be passed to nfs systemd services (nfs clients & server).
+#
+
+# 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 -T 32803"
+STATD_OPTS=""
+
+# Options to pass to sm-notify
+# e.g. SMNOTIFY_OPTS="-p 32764"
+SMNOTIFY_OPTS=""
+
+# Options to pass to rpc.idmapd.
+# See rpc.idmapd(8) for more details.
+IDMAPD_OPTS=""
+
+# Options to pass to rpc.gssd.
+# See rpc.gssd(8) for more details.
+GSSD_OPTS=""
+
Copied: nfs-utils/repos/testing-i686/nfs-server.conf (from rev 233336, nfs-utils/trunk/nfs-server.conf)
===================================================================
--- testing-i686/nfs-server.conf (rev 0)
+++ testing-i686/nfs-server.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,17 @@
+# Parameters to be passed to nfs systemd server services
+#
+
+# Options to pass to rpc.nfsd.
+# See rpc.nfsd(8) for more details.
+NFSD_OPTS=""
+
+# 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="-p 20048"
+MOUNTD_OPTS=""
+
+# Options to pass to rpc.svcgssd.
+# See rpc.svcgssd(8) for more details.
+SVCGSSD_OPTS=""
Copied: nfs-utils/repos/testing-i686/nfs-utils-1.3.2-statd-bg.patch (from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch)
===================================================================
--- testing-i686/nfs-utils-1.3.2-statd-bg.patch (rev 0)
+++ testing-i686/nfs-utils-1.3.2-statd-bg.patch 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,25 @@
+commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+Author: Chris Mayo <aklhfex at gmail.com>
+Date: Sun Feb 1 12:03:46 2015 -0500
+
+ statd: Fix test for foreground mode
+
+ daemon_init parameter has the opposite sense
+ to code removed in commit 7addf9d
+
+ Signed-off-by: Chris Mayo <aklhfex at gmail.com>
+ Signed-off-by: Steve Dickson <steved at redhat.com>
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ simulator (--argc, ++argv); /* simulator() does exit() */
+ #endif
+
+- daemon_init(!(run_mode & MODE_NODAEMON));
++ daemon_init((run_mode & MODE_NODAEMON));
+
+ if (run_mode & MODE_LOG_STDERR) {
+ xlog_syslog(0);
Copied: nfs-utils/repos/testing-i686/nfs-utils-1.3.2-statd-nowait.patch (from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-nowait.patch)
===================================================================
--- testing-i686/nfs-utils-1.3.2-statd-nowait.patch (rev 0)
+++ testing-i686/nfs-utils-1.3.2-statd-nowait.patch 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,35 @@
+From 650633d4e956dc6b628da30c868e39fba76a0b29 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved at redhat.com>
+Date: Mon, 9 Feb 2015 08:54:54 -0500
+Subject: [PATCH] rpc-statd-notify: Don't wait for the network to come up
+
+rpc-statd-notify only needs to wait for the network
+interface to be configured not to be connected since
+it forks into background and will wait 15mins for
+the network to come up.
+
+This decrease boot times when networks are not
+and will not be connected.
+
+Signed-off-by: Steve Dickson <steved at redhat.com>
+Reported-By: Eric Work <work.eric at gmail.com>
+---
+ systemd/rpc-statd-notify.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service
+index 941afe5..a655445 100644
+--- a/systemd/rpc-statd-notify.service
++++ b/systemd/rpc-statd-notify.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Notify NFS peers of a restart
+ Requires=network-online.target
+-After=network-online.target nss-lookup.target
++After=network.target nss-lookup.target
+
+ # if we run an nfs server, it needs to be running before we
+ # tell clients that it has restarted.
+--
+2.1.0
+
Copied: nfs-utils/repos/testing-i686/nfs-utils.conf (from rev 233336, nfs-utils/trunk/nfs-utils.conf)
===================================================================
--- testing-i686/nfs-utils.conf (rev 0)
+++ testing-i686/nfs-utils.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1 @@
+nfs
Copied: nfs-utils/repos/testing-i686/nfs-utils.install (from rev 233336, nfs-utils/trunk/nfs-utils.install)
===================================================================
--- testing-i686/nfs-utils.install (rev 0)
+++ testing-i686/nfs-utils.install 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,28 @@
+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.
+EOM
+}
+
+post_upgrade() {
+ if [ "$(vercmp $2 1.3.0-3)" -lt 0 ]; then
+cat << 'EOM'
+ ==> IMPORTANT 1.3.0 NFS UTILS CHANGES:
+ ==> This is a rather important upgrade, you are going to have to change systemd services files.
+ ==> NFS-SERVER:
+ ==> systemctl enable nfs-server.service
+ ==> NFS-CLIENT:
+ ==> systemctl enable nfs-client.target
+ ==>
+ ==> 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
+}
Copied: nfs-utils/repos/testing-i686/nfs-utils_env.sh (from rev 233336, nfs-utils/trunk/nfs-utils_env.sh)
===================================================================
--- testing-i686/nfs-utils_env.sh (rev 0)
+++ testing-i686/nfs-utils_env.sh 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,20 @@
+#!/bin/bash
+# archlinux config files
+. /etc/conf.d/nfs-common.conf
+. /etc/conf.d/nfs-server.conf
+# config file read by systemd files
+NFS_UTILS_CONFIG=/run/sysconfig/nfs-utils
+
+[[ -d /run/sysconfig ]] || mkdir /run/sysconfig
+[[ -e $NFS_UTILS_CONFIG ]] && rm -f $NFS_UTILS_CONFIG
+
+# /etc/conf.d/nfs-common
+echo "STATDARGS=\"$STATD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "SMNOTIFYARGS=\"$SMNOTIFY_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "RPCIDMAPDARGS=\"$IDMAPD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "GSSDARGS=\"$GSSD_OPTS\"" >> $NFS_UTILS_CONFIG
+
+# /etc/conf.d/nfs-server
+echo "RPCMOUNTDARGS=\"$MOUNTD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "RPCNFSDARGS=\"$NFSD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "SVCGSSDARGS=\"$SVCGSSD_OPTS\"" >> $NFS_UTILS_CONFIG
\ No newline at end of file
Copied: nfs-utils/repos/testing-x86_64/PKGBUILD (from rev 233336, nfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+# Contributor: abelstr <abel at pinklf.eu>
+# Contributor: Marco Lima <cipparello gmail com>
+
+pkgname=nfs-utils
+pkgver=1.3.2
+pkgrel=6
+pkgdesc="Support programs for Network File Systems"
+arch=('i686' 'x86_64')
+url='http://nfs.sourceforge.net'
+license=('GPL2')
+backup=(etc/{exports,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
+depends=('rpcbind' 'librpcsecgss>=0.19-2' 'nfsidmap' 'gssproxy'
+ 'libevent>=2.0.10' 'device-mapper')
+makedepends=('sqlite')
+source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{bz2,sign}
+ nfs-common.conf nfs-server.conf exports nfs-utils.conf id_resolver.conf
+ nfs-utils_env.sh
+ nfs-utils-1.3.2-statd-bg.patch
+ nfs-utils-1.3.2-statd-nowait.patch)
+install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage'
+ 'python2: for nfsiostat and mountstats usage')
+md5sums=('1e2f3c1ed468dee02d00c534c002ea10'
+ 'SKIP'
+ '95129639a19da1f262d4eb3ac73e0bdb'
+ '7bd61e84ee05054f5232b2e8063ea08d'
+ 'e6ad3c7a59c7e4c24965a0e7da35026c'
+ '8ac484023d786766d287ccbe878ae4ba'
+ '2e203f35ee753f5264a951cf43d4168e'
+ 'c6c9c32f153dfa6c0477ea6b99354288'
+ '45f55a5d581b2527b453c3a0816add24'
+ 'dde4e23776a2425d2a1241eb2daf8b7c')
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix rpc.statd starting
+ patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-bg.patch
+ # don't wait for online target on statd
+ patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-nowait.patch
+
+ # fix hardcoded sbin path to our needs
+ sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+ autoreconf -vfi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-gss \
+ --without-tcp-wrappers \
+ --with-statedir=/var/lib/nfs \
+ --enable-ipv6 \
+ --enable-libmount-mount \
+ --enable-mountconfig \
+ --with-start-statd=/usr/bin/start-statd
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make -k check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir" install
+
+ sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
+
+ install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
+
+ for i in systemd/{*.service,*.mount,*.target}; do
+ install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$(basename $i)
+ done
+
+ cd ..
+ 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 755 nfs-utils_env.sh "$pkgdir"/usr/lib/systemd/scripts/nfs-utils_env.sh
+ install -D -m 644 exports "$pkgdir"/etc/exports
+ install -D -m 644 id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf
+ install -D -m 644 nfs-utils.conf "$pkgdir"/usr/lib/modules-load.d/nfs-utils.conf
+ mkdir "$pkgdir"/etc/exports.d
+ mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs
+ mkdir "$pkgdir"/var/lib/nfs/v4recovery
+}
Copied: nfs-utils/repos/testing-x86_64/exports (from rev 233336, nfs-utils/trunk/exports)
===================================================================
--- testing-x86_64/exports (rev 0)
+++ testing-x86_64/exports 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,12 @@
+# /etc/exports - exports(5) - directories exported to NFS clients
+#
+# 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 *(rw,sync,sec=krb5i,fsid=0)
+# /srv/nfs4/home *(rw,sync,sec=krb5i,nohide)
+#
+# Use `exportfs -arv` to reload.
Copied: nfs-utils/repos/testing-x86_64/id_resolver.conf (from rev 233336, nfs-utils/trunk/id_resolver.conf)
===================================================================
--- testing-x86_64/id_resolver.conf (rev 0)
+++ testing-x86_64/id_resolver.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,9 @@
+#
+# nfsidmap(5) - The NFS idmapper upcall program
+# Summary: Used by NFSv4 to map user/group ids into
+# user/group names and names into in ids
+# Options:
+# -v Increases the verbosity of the output to syslog
+# -t timeout Set the expiration timer, in seconds, on the key
+#
+create id_resolver * * /usr/bin/nfsidmap %k %d
Copied: nfs-utils/repos/testing-x86_64/nfs-common.conf (from rev 233336, nfs-utils/trunk/nfs-common.conf)
===================================================================
--- testing-x86_64/nfs-common.conf (rev 0)
+++ testing-x86_64/nfs-common.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,22 @@
+# Parameters to be passed to nfs systemd services (nfs clients & server).
+#
+
+# 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 -T 32803"
+STATD_OPTS=""
+
+# Options to pass to sm-notify
+# e.g. SMNOTIFY_OPTS="-p 32764"
+SMNOTIFY_OPTS=""
+
+# Options to pass to rpc.idmapd.
+# See rpc.idmapd(8) for more details.
+IDMAPD_OPTS=""
+
+# Options to pass to rpc.gssd.
+# See rpc.gssd(8) for more details.
+GSSD_OPTS=""
+
Copied: nfs-utils/repos/testing-x86_64/nfs-server.conf (from rev 233336, nfs-utils/trunk/nfs-server.conf)
===================================================================
--- testing-x86_64/nfs-server.conf (rev 0)
+++ testing-x86_64/nfs-server.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,17 @@
+# Parameters to be passed to nfs systemd server services
+#
+
+# Options to pass to rpc.nfsd.
+# See rpc.nfsd(8) for more details.
+NFSD_OPTS=""
+
+# 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="-p 20048"
+MOUNTD_OPTS=""
+
+# Options to pass to rpc.svcgssd.
+# See rpc.svcgssd(8) for more details.
+SVCGSSD_OPTS=""
Copied: nfs-utils/repos/testing-x86_64/nfs-utils-1.3.2-statd-bg.patch (from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch)
===================================================================
--- testing-x86_64/nfs-utils-1.3.2-statd-bg.patch (rev 0)
+++ testing-x86_64/nfs-utils-1.3.2-statd-bg.patch 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,25 @@
+commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+Author: Chris Mayo <aklhfex at gmail.com>
+Date: Sun Feb 1 12:03:46 2015 -0500
+
+ statd: Fix test for foreground mode
+
+ daemon_init parameter has the opposite sense
+ to code removed in commit 7addf9d
+
+ Signed-off-by: Chris Mayo <aklhfex at gmail.com>
+ Signed-off-by: Steve Dickson <steved at redhat.com>
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ simulator (--argc, ++argv); /* simulator() does exit() */
+ #endif
+
+- daemon_init(!(run_mode & MODE_NODAEMON));
++ daemon_init((run_mode & MODE_NODAEMON));
+
+ if (run_mode & MODE_LOG_STDERR) {
+ xlog_syslog(0);
Copied: nfs-utils/repos/testing-x86_64/nfs-utils-1.3.2-statd-nowait.patch (from rev 233336, nfs-utils/trunk/nfs-utils-1.3.2-statd-nowait.patch)
===================================================================
--- testing-x86_64/nfs-utils-1.3.2-statd-nowait.patch (rev 0)
+++ testing-x86_64/nfs-utils-1.3.2-statd-nowait.patch 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,35 @@
+From 650633d4e956dc6b628da30c868e39fba76a0b29 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved at redhat.com>
+Date: Mon, 9 Feb 2015 08:54:54 -0500
+Subject: [PATCH] rpc-statd-notify: Don't wait for the network to come up
+
+rpc-statd-notify only needs to wait for the network
+interface to be configured not to be connected since
+it forks into background and will wait 15mins for
+the network to come up.
+
+This decrease boot times when networks are not
+and will not be connected.
+
+Signed-off-by: Steve Dickson <steved at redhat.com>
+Reported-By: Eric Work <work.eric at gmail.com>
+---
+ systemd/rpc-statd-notify.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service
+index 941afe5..a655445 100644
+--- a/systemd/rpc-statd-notify.service
++++ b/systemd/rpc-statd-notify.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Notify NFS peers of a restart
+ Requires=network-online.target
+-After=network-online.target nss-lookup.target
++After=network.target nss-lookup.target
+
+ # if we run an nfs server, it needs to be running before we
+ # tell clients that it has restarted.
+--
+2.1.0
+
Copied: nfs-utils/repos/testing-x86_64/nfs-utils.conf (from rev 233336, nfs-utils/trunk/nfs-utils.conf)
===================================================================
--- testing-x86_64/nfs-utils.conf (rev 0)
+++ testing-x86_64/nfs-utils.conf 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1 @@
+nfs
Copied: nfs-utils/repos/testing-x86_64/nfs-utils.install (from rev 233336, nfs-utils/trunk/nfs-utils.install)
===================================================================
--- testing-x86_64/nfs-utils.install (rev 0)
+++ testing-x86_64/nfs-utils.install 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,28 @@
+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.
+EOM
+}
+
+post_upgrade() {
+ if [ "$(vercmp $2 1.3.0-3)" -lt 0 ]; then
+cat << 'EOM'
+ ==> IMPORTANT 1.3.0 NFS UTILS CHANGES:
+ ==> This is a rather important upgrade, you are going to have to change systemd services files.
+ ==> NFS-SERVER:
+ ==> systemctl enable nfs-server.service
+ ==> NFS-CLIENT:
+ ==> systemctl enable nfs-client.target
+ ==>
+ ==> 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
+}
Copied: nfs-utils/repos/testing-x86_64/nfs-utils_env.sh (from rev 233336, nfs-utils/trunk/nfs-utils_env.sh)
===================================================================
--- testing-x86_64/nfs-utils_env.sh (rev 0)
+++ testing-x86_64/nfs-utils_env.sh 2015-03-11 07:19:57 UTC (rev 233337)
@@ -0,0 +1,20 @@
+#!/bin/bash
+# archlinux config files
+. /etc/conf.d/nfs-common.conf
+. /etc/conf.d/nfs-server.conf
+# config file read by systemd files
+NFS_UTILS_CONFIG=/run/sysconfig/nfs-utils
+
+[[ -d /run/sysconfig ]] || mkdir /run/sysconfig
+[[ -e $NFS_UTILS_CONFIG ]] && rm -f $NFS_UTILS_CONFIG
+
+# /etc/conf.d/nfs-common
+echo "STATDARGS=\"$STATD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "SMNOTIFYARGS=\"$SMNOTIFY_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "RPCIDMAPDARGS=\"$IDMAPD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "GSSDARGS=\"$GSSD_OPTS\"" >> $NFS_UTILS_CONFIG
+
+# /etc/conf.d/nfs-server
+echo "RPCMOUNTDARGS=\"$MOUNTD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "RPCNFSDARGS=\"$NFSD_OPTS\"" >> $NFS_UTILS_CONFIG
+echo "SVCGSSDARGS=\"$SVCGSSD_OPTS\"" >> $NFS_UTILS_CONFIG
\ No newline at end of file
More information about the arch-commits
mailing list