From patchwork Thu Feb 20 06:55:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 3684771 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6FBCF9F39B for ; Thu, 20 Feb 2014 06:57:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3DAF20123 for ; Thu, 20 Feb 2014 06:57:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9994D201B6 for ; Thu, 20 Feb 2014 06:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751229AbaBTG4r (ORCPT ); Thu, 20 Feb 2014 01:56:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:43685 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbaBTG4n (ORCPT ); Thu, 20 Feb 2014 01:56:43 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 595B8ACB1; Thu, 20 Feb 2014 06:56:42 +0000 (UTC) From: Neil Brown To: Steve Dickson Date: Thu, 20 Feb 2014 17:55:30 +1100 Subject: [PATCH 4/6] systemd: remove @localstatedir@ marking. Cc: linux-nfs@vger.kernel.org Message-ID: <20140220065530.7320.89196.stgit@notabene.brown> In-Reply-To: <20140220065345.7320.49992.stgit@notabene.brown> References: <20140220065345.7320.49992.stgit@notabene.brown> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This isn't used so currently is inconvenient. Once we decide how to handle this sort of thing we can apply the change uniformly. Signed-off-by: NeilBrown --- systemd/rpc-svcgssd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/systemd/rpc-svcgssd.service b/systemd/rpc-svcgssd.service index 32b786ec5c7d..f7424b0b1085 100644 --- a/systemd/rpc-svcgssd.service +++ b/systemd/rpc-svcgssd.service @@ -6,7 +6,7 @@ PartOf=nfs-server.service PartOf=nfs-utils.service After=gssproxy.service -ConditionPathExists=|!@localstatedir@/run/gssproxy.pid +ConditionPathExists=|!/run/gssproxy.pid ConditionPathExists=|!/proc/net/rpc/use-gss-proxy ConditionPathExists=/etc/krb5.keytab