[arch-commits] Commit in nfs-utils/repos (20 files)
Andreas Radke
andyrtr at archlinux.org
Mon Oct 19 16:07:49 UTC 2015
Date: Monday, October 19, 2015 @ 18:07:49
Author: andyrtr
Revision: 249511
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nfs-utils/repos/testing-i686/
nfs-utils/repos/testing-i686/PKGBUILD
(from rev 249510, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-i686/exports
(from rev 249510, nfs-utils/trunk/exports)
nfs-utils/repos/testing-i686/id_resolver.conf
(from rev 249510, nfs-utils/trunk/id_resolver.conf)
nfs-utils/repos/testing-i686/ignore_unsupported_address_types_in_nfssvc_setfds.diff
(from rev 249510, nfs-utils/trunk/ignore_unsupported_address_types_in_nfssvc_setfds.diff)
nfs-utils/repos/testing-i686/nfs-common.conf
(from rev 249510, nfs-utils/trunk/nfs-common.conf)
nfs-utils/repos/testing-i686/nfs-server.conf
(from rev 249510, nfs-utils/trunk/nfs-server.conf)
nfs-utils/repos/testing-i686/nfs-utils.conf
(from rev 249510, nfs-utils/trunk/nfs-utils.conf)
nfs-utils/repos/testing-i686/nfs-utils.install
(from rev 249510, nfs-utils/trunk/nfs-utils.install)
nfs-utils/repos/testing-i686/nfs-utils_env.sh
(from rev 249510, nfs-utils/trunk/nfs-utils_env.sh)
nfs-utils/repos/testing-x86_64/
nfs-utils/repos/testing-x86_64/PKGBUILD
(from rev 249510, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-x86_64/exports
(from rev 249510, nfs-utils/trunk/exports)
nfs-utils/repos/testing-x86_64/id_resolver.conf
(from rev 249510, nfs-utils/trunk/id_resolver.conf)
nfs-utils/repos/testing-x86_64/ignore_unsupported_address_types_in_nfssvc_setfds.diff
(from rev 249510, nfs-utils/trunk/ignore_unsupported_address_types_in_nfssvc_setfds.diff)
nfs-utils/repos/testing-x86_64/nfs-common.conf
(from rev 249510, nfs-utils/trunk/nfs-common.conf)
nfs-utils/repos/testing-x86_64/nfs-server.conf
(from rev 249510, nfs-utils/trunk/nfs-server.conf)
nfs-utils/repos/testing-x86_64/nfs-utils.conf
(from rev 249510, nfs-utils/trunk/nfs-utils.conf)
nfs-utils/repos/testing-x86_64/nfs-utils.install
(from rev 249510, nfs-utils/trunk/nfs-utils.install)
nfs-utils/repos/testing-x86_64/nfs-utils_env.sh
(from rev 249510, nfs-utils/trunk/nfs-utils_env.sh)
-----------------------------------------------------------------------+
testing-i686/PKGBUILD | 91 ++++++++++
testing-i686/exports | 12 +
testing-i686/id_resolver.conf | 9
testing-i686/ignore_unsupported_address_types_in_nfssvc_setfds.diff | 37 ++++
testing-i686/nfs-common.conf | 22 ++
testing-i686/nfs-server.conf | 17 +
testing-i686/nfs-utils.conf | 1
testing-i686/nfs-utils.install | 28 +++
testing-i686/nfs-utils_env.sh | 20 ++
testing-x86_64/PKGBUILD | 91 ++++++++++
testing-x86_64/exports | 12 +
testing-x86_64/id_resolver.conf | 9
testing-x86_64/ignore_unsupported_address_types_in_nfssvc_setfds.diff | 37 ++++
testing-x86_64/nfs-common.conf | 22 ++
testing-x86_64/nfs-server.conf | 17 +
testing-x86_64/nfs-utils.conf | 1
testing-x86_64/nfs-utils.install | 28 +++
testing-x86_64/nfs-utils_env.sh | 20 ++
18 files changed, 474 insertions(+)
Copied: nfs-utils/repos/testing-i686/PKGBUILD (from rev 249510, nfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-10-19 16:07:49 UTC (rev 249511)
@@ -0,0 +1,91 @@
+# $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.3
+pkgrel=2
+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
+ ignore_unsupported_address_types_in_nfssvc_setfds.diff)
+install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage'
+ 'python2: for nfsiostat and mountstats usage')
+sha1sums=('7c561e6a22a626aed93766bdb0c34e9a4e77b9e7'
+ 'SKIP'
+ '44deb1c199d89ef866d90aad47eadd3b44070b59'
+ '2658a0e9d9ff8e4be7b3f190f6743f5b83852f3f'
+ '170a929d9c0f22edb13b656648cadf372efea841'
+ 'c109f2300f2d841104adb09fe76a5f2583015c72'
+ '24b3c10b47dc120b2d252cf1e5001effa8f76a62'
+ '96734598a0b851da10cb9e02afb52ec55fed6273'
+ '0fa72f3e3485abf71b1199caa1e6089f9f129a77')
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # fix IPv6-less kernels; FS#46739
+ patch -Np1 -i $srcdir/ignore_unsupported_address_types_in_nfssvc_setfds.diff
+
+ # 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 249510, nfs-utils/trunk/exports)
===================================================================
--- testing-i686/exports (rev 0)
+++ testing-i686/exports 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/id_resolver.conf)
===================================================================
--- testing-i686/id_resolver.conf (rev 0)
+++ testing-i686/id_resolver.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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/ignore_unsupported_address_types_in_nfssvc_setfds.diff (from rev 249510, nfs-utils/trunk/ignore_unsupported_address_types_in_nfssvc_setfds.diff)
===================================================================
--- testing-i686/ignore_unsupported_address_types_in_nfssvc_setfds.diff (rev 0)
+++ testing-i686/ignore_unsupported_address_types_in_nfssvc_setfds.diff 2015-10-19 16:07:49 UTC (rev 249511)
@@ -0,0 +1,37 @@
+From: Christoph Hellwig <hch at lst.de>
+Subject: nfsd: ignore unsupported address types in nfssvc_setfds
+
+Just continue and try a different record returned from getaddrinfo
+if the kernel does not support an address family. This fixes nfsd
+startup on kernels without IPv6 support.
+
+Suggested-by: Chuck Lever <chuck.lever at oracle.com>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+
+diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
+index a2b11d8..fc11d23 100644
+--- a/utils/nfsd/nfssvc.c
++++ b/utils/nfsd/nfssvc.c
+@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
+ sockfd = socket(addr->ai_family, addr->ai_socktype,
+ addr->ai_protocol);
+ if (sockfd < 0) {
+- if (errno == EAFNOSUPPORT)
+- xlog(L_NOTICE, "address family %s not "
+- "supported by protocol %s",
+- family, proto);
+- else
++ if (errno != EAFNOSUPPORT) {
+ xlog(L_ERROR, "unable to create %s %s socket: "
+ "errno %d (%m)", family, proto, errno);
+- rc = errno;
+- goto error;
++ rc = errno;
++ goto error;
++ }
++ addr = addr->ai_next;
++ continue;
+ }
+ #ifdef IPV6_SUPPORTED
+ if (addr->ai_family == AF_INET6 &&
+--
Copied: nfs-utils/repos/testing-i686/nfs-common.conf (from rev 249510, nfs-utils/trunk/nfs-common.conf)
===================================================================
--- testing-i686/nfs-common.conf (rev 0)
+++ testing-i686/nfs-common.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/nfs-server.conf)
===================================================================
--- testing-i686/nfs-server.conf (rev 0)
+++ testing-i686/nfs-server.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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.conf (from rev 249510, nfs-utils/trunk/nfs-utils.conf)
===================================================================
--- testing-i686/nfs-utils.conf (rev 0)
+++ testing-i686/nfs-utils.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -0,0 +1 @@
+nfs
Copied: nfs-utils/repos/testing-i686/nfs-utils.install (from rev 249510, nfs-utils/trunk/nfs-utils.install)
===================================================================
--- testing-i686/nfs-utils.install (rev 0)
+++ testing-i686/nfs-utils.install 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/nfs-utils_env.sh)
===================================================================
--- testing-i686/nfs-utils_env.sh (rev 0)
+++ testing-i686/nfs-utils_env.sh 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-10-19 16:07:49 UTC (rev 249511)
@@ -0,0 +1,91 @@
+# $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.3
+pkgrel=2
+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
+ ignore_unsupported_address_types_in_nfssvc_setfds.diff)
+install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage'
+ 'python2: for nfsiostat and mountstats usage')
+sha1sums=('7c561e6a22a626aed93766bdb0c34e9a4e77b9e7'
+ 'SKIP'
+ '44deb1c199d89ef866d90aad47eadd3b44070b59'
+ '2658a0e9d9ff8e4be7b3f190f6743f5b83852f3f'
+ '170a929d9c0f22edb13b656648cadf372efea841'
+ 'c109f2300f2d841104adb09fe76a5f2583015c72'
+ '24b3c10b47dc120b2d252cf1e5001effa8f76a62'
+ '96734598a0b851da10cb9e02afb52ec55fed6273'
+ '0fa72f3e3485abf71b1199caa1e6089f9f129a77')
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # fix IPv6-less kernels; FS#46739
+ patch -Np1 -i $srcdir/ignore_unsupported_address_types_in_nfssvc_setfds.diff
+
+ # 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 249510, nfs-utils/trunk/exports)
===================================================================
--- testing-x86_64/exports (rev 0)
+++ testing-x86_64/exports 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/id_resolver.conf)
===================================================================
--- testing-x86_64/id_resolver.conf (rev 0)
+++ testing-x86_64/id_resolver.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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/ignore_unsupported_address_types_in_nfssvc_setfds.diff (from rev 249510, nfs-utils/trunk/ignore_unsupported_address_types_in_nfssvc_setfds.diff)
===================================================================
--- testing-x86_64/ignore_unsupported_address_types_in_nfssvc_setfds.diff (rev 0)
+++ testing-x86_64/ignore_unsupported_address_types_in_nfssvc_setfds.diff 2015-10-19 16:07:49 UTC (rev 249511)
@@ -0,0 +1,37 @@
+From: Christoph Hellwig <hch at lst.de>
+Subject: nfsd: ignore unsupported address types in nfssvc_setfds
+
+Just continue and try a different record returned from getaddrinfo
+if the kernel does not support an address family. This fixes nfsd
+startup on kernels without IPv6 support.
+
+Suggested-by: Chuck Lever <chuck.lever at oracle.com>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+
+diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
+index a2b11d8..fc11d23 100644
+--- a/utils/nfsd/nfssvc.c
++++ b/utils/nfsd/nfssvc.c
+@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
+ sockfd = socket(addr->ai_family, addr->ai_socktype,
+ addr->ai_protocol);
+ if (sockfd < 0) {
+- if (errno == EAFNOSUPPORT)
+- xlog(L_NOTICE, "address family %s not "
+- "supported by protocol %s",
+- family, proto);
+- else
++ if (errno != EAFNOSUPPORT) {
+ xlog(L_ERROR, "unable to create %s %s socket: "
+ "errno %d (%m)", family, proto, errno);
+- rc = errno;
+- goto error;
++ rc = errno;
++ goto error;
++ }
++ addr = addr->ai_next;
++ continue;
+ }
+ #ifdef IPV6_SUPPORTED
+ if (addr->ai_family == AF_INET6 &&
+--
Copied: nfs-utils/repos/testing-x86_64/nfs-common.conf (from rev 249510, nfs-utils/trunk/nfs-common.conf)
===================================================================
--- testing-x86_64/nfs-common.conf (rev 0)
+++ testing-x86_64/nfs-common.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/nfs-server.conf)
===================================================================
--- testing-x86_64/nfs-server.conf (rev 0)
+++ testing-x86_64/nfs-server.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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.conf (from rev 249510, nfs-utils/trunk/nfs-utils.conf)
===================================================================
--- testing-x86_64/nfs-utils.conf (rev 0)
+++ testing-x86_64/nfs-utils.conf 2015-10-19 16:07:49 UTC (rev 249511)
@@ -0,0 +1 @@
+nfs
Copied: nfs-utils/repos/testing-x86_64/nfs-utils.install (from rev 249510, nfs-utils/trunk/nfs-utils.install)
===================================================================
--- testing-x86_64/nfs-utils.install (rev 0)
+++ testing-x86_64/nfs-utils.install 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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 249510, nfs-utils/trunk/nfs-utils_env.sh)
===================================================================
--- testing-x86_64/nfs-utils_env.sh (rev 0)
+++ testing-x86_64/nfs-utils_env.sh 2015-10-19 16:07:49 UTC (rev 249511)
@@ -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