From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EAB2138334 for ; Mon, 2 Sep 2019 07:08:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF88FE0884; Mon, 2 Sep 2019 07:08:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9952E0884 for ; Mon, 2 Sep 2019 07:08:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9877834AA07 for ; Mon, 2 Sep 2019 07:08:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FE67780 for ; Mon, 2 Sep 2019 07:08:44 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1567408093.998148dd775a5c629266fcd1c93837ac8ee3541d.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/files/nfs.initd X-VCS-Directories: net-fs/nfs-utils/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 998148dd775a5c629266fcd1c93837ac8ee3541d X-VCS-Branch: master Date: Mon, 2 Sep 2019 07:08:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5744b2c7-359c-448f-8737-6426542c19c5 X-Archives-Hash: d4f5a54d63faa751de2e56da373ad1f0 commit: 998148dd775a5c629266fcd1c93837ac8ee3541d Author: Matt Turner gentoo org> AuthorDate: Mon Sep 2 05:50:16 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Sep 2 07:08:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998148dd 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 gentoo.org> net-fs/nfs-utils/files/nfs.initd | 8 +------- 1 file changed, 1 insertion(+), 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 }