summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2019-09-01 22:50:16 -0700
committerMatt Turner <mattst88@gentoo.org>2019-09-02 00:08:13 -0700
commit998148dd775a5c629266fcd1c93837ac8ee3541d (patch)
tree06e4d7a024f0297b8ef69f605ed454dc2f6f510b /net-fs/nfs-utils/files
parentnet-fs/nfs-utils: Don't assume REPLACING_VERSIONS is singular (diff)
downloadgentoo-998148dd775a5c629266fcd1c93837ac8ee3541d.tar.gz
gentoo-998148dd775a5c629266fcd1c93837ac8ee3541d.tar.bz2
gentoo-998148dd775a5c629266fcd1c93837ac8ee3541d.zip
net-fs/nfs-utils: Don't unexport directories on restart
Originally added in 2007 (see commit a0fefa89daef "Remove some bashisms and support baselayout-2 restart option." in the historical repo), = vs != looks like an obvious typo. But, with RC_CMD, we don't need the extra restarting variable. Closes: https://bugs.gentoo.org/675644 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'net-fs/nfs-utils/files')
-rw-r--r--net-fs/nfs-utils/files/nfs.initd8
1 files changed, 1 insertions, 7 deletions
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 4b572fc2e5e..bf599021c9a 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -4,10 +4,6 @@
extra_started_commands="reload"
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
# The binary locations
exportfs=/usr/sbin/exportfs
mountd=/usr/sbin/rpc.mountd
@@ -131,7 +127,7 @@ stop() {
# then "exportfs -r" will reread the xtab, and all the current
# clients will be able to resume NFS activity, *without* needing
# to umount/(re)mount the filesystem.
- if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then
+ if [ "${RC_CMD}" != "restart" ] ; then
ebegin "Unexporting NFS directories"
# Exportfs likes to hang if networking isn't working.
# If that's the case, then try to kill it so the
@@ -155,8 +151,6 @@ reload() {
}
restart() {
- # See long comment in stop() regarding "restarting" and exportfs -ua
- restarting=yes
svc_stop
svc_start
}