From patchwork Mon Apr 24 15:27:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 9696603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A04D660113 for ; Mon, 24 Apr 2017 15:28:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9165928236 for ; Mon, 24 Apr 2017 15:28:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8618F283FD; Mon, 24 Apr 2017 15:28:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 170BA28236 for ; Mon, 24 Apr 2017 15:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1173022AbdDXP1z (ORCPT ); Mon, 24 Apr 2017 11:27:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54008 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1169990AbdDXP1y (ORCPT ); Mon, 24 Apr 2017 11:27:54 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5747AC05490A for ; Mon, 24 Apr 2017 15:27:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5747AC05490A Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=steved@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5747AC05490A Received: from steved.boston.devel.redhat.com (ovpn-122-178.rdu2.redhat.com [10.10.122.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id 089648367F for ; Mon, 24 Apr 2017 15:27:53 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH] systemd: Afters are also needed for the Wants=network-online.target Date: Mon, 24 Apr 2017 11:27:52 -0400 Message-Id: <20170424152752.25730-1-steved@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 24 Apr 2017 15:27:54 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 9d4fc3fb added Wants=network-online.target which is not enough to ensure the network is completely up before the NFS server is started. After=network-online.target is also needed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1419351 Signed-off-by: Steve Dickson --- systemd/nfs-mountd.service | 1 + systemd/nfs-server.service | 2 +- systemd/rpc-statd-notify.service | 2 +- systemd/rpc-statd.service | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service index fec0399..e8ece53 100644 --- a/systemd/nfs-mountd.service +++ b/systemd/nfs-mountd.service @@ -4,6 +4,7 @@ DefaultDependencies=no Requires=proc-fs-nfsd.mount Wants=network-online.target After=proc-fs-nfsd.mount +After=network-online.target local-fs.target After=rpcbind.socket BindsTo=nfs-server.service diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service index e6b8f58..136552b 100644 --- a/systemd/nfs-server.service +++ b/systemd/nfs-server.service @@ -7,7 +7,7 @@ Wants=rpcbind.socket network-online.target Wants=rpc-statd.service nfs-idmapd.service Wants=rpc-statd-notify.service -After= local-fs.target +After= network-online.target local-fs.target After= proc-fs-nfsd.mount rpcbind.socket nfs-mountd.service After= nfs-idmapd.service rpc-statd.service Before= rpc-statd-notify.service diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service index f54d4c5..687fe31 100644 --- a/systemd/rpc-statd-notify.service +++ b/systemd/rpc-statd-notify.service @@ -2,7 +2,7 @@ Description=Notify NFS peers of a restart DefaultDependencies=no Wants=network-online.target -After=local-fs.target network.target nss-lookup.target +After=local-fs.target network-online.target nss-lookup.target # if we run an nfs server, it needs to be running before we # tell clients that it has restarted. diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service index 8cef022..f41ae20 100644 --- a/systemd/rpc-statd.service +++ b/systemd/rpc-statd.service @@ -4,7 +4,7 @@ DefaultDependencies=no Conflicts=umount.target Requires=nss-lookup.target rpcbind.socket Wants=network-online.target -After=nss-lookup.target rpcbind.socket +After=network-online.target nss-lookup.target rpcbind.socket PartOf=nfs-utils.service