summaryrefslogtreecommitdiff
path: root/source/n/nfs-utils
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-04-08 20:39:32 +0000
committerEric Hameleers <alien@slackware.com>2019-04-09 08:59:45 +0200
commit98da28576517634e745ac6a4b65cf869a14bce79 (patch)
tree851d16248ded8fbc5eed627268541c7ff496aea3 /source/n/nfs-utils
parent262172ad7b61d5057e6278d3a485991c593632c9 (diff)
downloadcurrent-98da28576517634e745ac6a4b65cf869a14bce79.tar.gz
Mon Apr 8 20:39:32 UTC 201920190408203932
a/glibc-zoneinfo-2019a-noarch-1.txz: Upgraded. a/grub-2.02-x86_64-5.txz: Rebuilt. Support F2FS filesystem. Thanks to Nille_kungen. ap/cups-filters-1.22.5-x86_64-1.txz: Upgraded. ap/itstool-2.0.6-x86_64-1.txz: Upgraded. d/python-setuptools-41.0.0-x86_64-1.txz: Upgraded. l/gobject-introspection-1.60.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_39-x86_64-1.txz: Upgraded. l/libcroco-0.6.13-x86_64-1.txz: Upgraded. l/libnotify-0.7.8-x86_64-1.txz: Upgraded. n/cifs-utils-6.9-x86_64-1.txz: Upgraded. n/nfs-utils-2.3.3-x86_64-2.txz: Rebuilt. Include recovery directory. Thanks to upnort. n/samba-4.10.2-x86_64-1.txz: Upgraded. This is a security release in order to address the following defects: World writable files in Samba AD DC private/ dir. Save registry file outside share as unprivileged user. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3870 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3880 (* Security fix *) x/libva-2.4.1-x86_64-1.txz: Upgraded. x/pixman-0.38.2-x86_64-1.txz: Upgraded. xap/gimp-2.10.10-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/nfs-utils')
-rwxr-xr-xsource/n/nfs-utils/nfs-utils.SlackBuild5
-rw-r--r--source/n/nfs-utils/rc.nfsd8
2 files changed, 12 insertions, 1 deletions
diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 217ed6f2..336ffb29 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=nfs-utils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -132,6 +132,9 @@ mkdir -p $PKG/sbin
mv $PKG/usr/sbin/rpc.statd $PKG/sbin
( cd $PKG/usr/sbin ; ln -sf ../../sbin/rpc.statd . )
+# Make recovery directory:
+mkdir -p $PKG/var/lib/nfs/v4recovery
+
# Chown /var/lib/nfs so that rpc.statd runs as rpc:rpc:
chown -R rpc:rpc $PKG/var/lib/nfs
diff --git a/source/n/nfs-utils/rc.nfsd b/source/n/nfs-utils/rc.nfsd
index 965db6b4..06c34b01 100644
--- a/source/n/nfs-utils/rc.nfsd
+++ b/source/n/nfs-utils/rc.nfsd
@@ -24,6 +24,14 @@ nfsd_start() {
exit # no uncommented shares in /etc/exports
fi
+ # Without this directory the logs will complain with
+ # 'NFSD: Unable to end grace period'.
+ NFSV4RECOVERYDIR=$(cat /proc/fs/nfsd/nfsv4recoverydir)
+ if [ -r /proc/fs/nfsd/nfsv4recoverydir -a ! -d "$NFSV4RECOVERYDIR" ]; then
+ mkdir "$NFSV4RECOVERYDIR"
+ chown -R rpc:rpc "$NFSV4RECOVERYDIR"
+ fi
+
# If we do not detect nfsd support built into the kernel (or previously
# loaded as a module), we will try to load the nfsd.ko kernel module:
if [ ! -r /proc/1/net/rpc/nfsd ]; then