Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:61487 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751916AbaI3PVo (ORCPT ); Tue, 30 Sep 2014 11:21:44 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8UFLhap024236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 30 Sep 2014 11:21:44 -0400 Date: Tue, 30 Sep 2014 11:21:39 -0400 From: Simo Sorce To: Steve Dickson Cc: linux-nfs@vger.kernel.org Subject: Re: [PATCH 1/1] Move the wants only to the auth unit. Message-ID: <20140930112139.4abf4eb6@willson.usersys.redhat.com> In-Reply-To: <542AC20B.9040509@RedHat.com> References: <1412014923-26587-1-git-send-email-simo@redhat.com> <1412014923-26587-2-git-send-email-simo@redhat.com> <542AC20B.9040509@RedHat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, 30 Sep 2014 10:45:31 -0400 Steve Dickson wrote: > > > On 09/29/2014 02:22 PM, Simo Sorce wrote: > > This way either gssproxy or rpc.svcgssd are started only if the > > auth module is requested, and it finds a keytab. > > If the wants are in the main nfs-client or nfs-server unit files > > then the two deamons are started unconditionally and would require > > conditions which we can test once and for all in a single unit file > > instead. > > > > Signed-off-by: Simo Sorce > > --- > > systemd/auth-rpcgss-module.service | 3 ++- > > systemd/nfs-client.target | 4 ++-- > > systemd/nfs-server.service | 1 - > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/systemd/auth-rpcgss-module.service > > b/systemd/auth-rpcgss-module.service index > > 3fc2f4ac924f7e9d6e24969bb9a21d88a5c144fc..0355e13e009528632e97373332db9fa3acdfd1a9 > > 100644 --- a/systemd/auth-rpcgss-module.service +++ > > b/systemd/auth-rpcgss-module.service @@ -6,7 +6,8 @@ > > # unit will fail. But that's OK.) > > [Unit] > > Description=Kernel Module supporting RPCSEC_GSS > > -Before=gssproxy.service rpc-svcgssd.service > > +Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service > > +Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service > > ConditionPathExists=/etc/krb5.keytab > > > > [Service] > > diff --git a/systemd/nfs-client.target b/systemd/nfs-client.target > > index > > 474f5e9ad74b70d265a7b2099556c2b9220bcdd0..f3d884a241543e41fdd91bcb0a055654b4b2c275 > > 100644 --- a/systemd/nfs-client.target +++ > > b/systemd/nfs-client.target @@ -5,9 +5,9 @@ > > Wants=remote-fs-pre.target > > # Note: we don't "Wants=rpc-statd.service" as "mount.nfs" will > > arrange to # start that on demand if needed. > > -Wants=rpc-gssd.service rpc-svcgssd.service > > auth-rpcgss-module.service +Wants= > > Wants=nfs-blkmap.service rpc-statd-notify.service > > -Before=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service > > +Before=nfs-blkmap.service > In the upstream version (commit 12a95edae) this is actually > After=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service > > and I think we should leave it because sync things up nicely > when both the server and client plus this patch is only > about moving Wants around... not Afters... I will send new patch with corrected After. Simo. > steved. > > > > > [Install] > > WantedBy=multi-user.target > > diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service > > index > > 1048c5cbbf68328a8ac8c88b67e477061cf487c7..a5039062ad95ca0c73c8a6c33d053a845d596185 > > 100644 --- a/systemd/nfs-server.service +++ > > b/systemd/nfs-server.service @@ -3,7 +3,6 @@ Description=NFS server > > and services Requires= network.target proc-fs-nfsd.mount > > rpcbind.target Requires= nfs-mountd.service > > Wants=rpc-statd.service nfs-idmapd.service > > auth-rpcgss-module.service -Wants=rpc-gssd.service gssproxy.service > > rpc-svcgssd.service Wants=rpc-statd-notify.service > > > > After= network.target proc-fs-nfsd.mount rpcbind.target > > nfs-mountd.service > > -- Simo Sorce * Red Hat, Inc * New York