From patchwork Sat Mar 19 19:11:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 8625641 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D3A70C0553 for ; Sat, 19 Mar 2016 19:12:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF65F203FB for ; Sat, 19 Mar 2016 19:12:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB86C203F3 for ; Sat, 19 Mar 2016 19:12:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754806AbcCSTLM (ORCPT ); Sat, 19 Mar 2016 15:11:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45714 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754224AbcCSTLM (ORCPT ); Sat, 19 Mar 2016 15:11:12 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A9CCD8553F for ; Sat, 19 Mar 2016 19:11:11 +0000 (UTC) Received: from steved.boston.devel.redhat.com (vpn-59-151.rdu2.redhat.com [10.10.59.151]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2JJBAkm013887 for ; Sat, 19 Mar 2016 15:11:11 -0400 From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH] Move nfs-utils_env.sh to a more appropriate directory Date: Sat, 19 Mar 2016 15:11:09 -0400 Message-Id: <1458414669-26671-1-git-send-email-steved@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 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 Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113 to move the script into /usr/libexec/nfs-utils Signed-off-by: Steve Dickson --- systemd/README | 2 +- systemd/nfs-config.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd/README b/systemd/README index bbd7790..7c43df8 100644 --- a/systemd/README +++ b/systemd/README @@ -53,7 +53,7 @@ client and systemd cannot specify is two-pronged reverse dependency. (i.e. stop this unit if none of these units are running) Distro specific commandline configuration can be provided by -installing a script /usr/lib/systemd/scripts/nfs-utils_env.sh +installing a script /usr/libexec/nfs-utils/nfs-utils_env.sh This should write /run/sysconfig/nfs-utils based on configuration information such as in /etc/sysconfig/nfs or /etc/defaults/nfs. It is run once by nfs-config.service. diff --git a/systemd/nfs-config.service b/systemd/nfs-config.service index 4b206b5..bd69e84 100644 --- a/systemd/nfs-config.service +++ b/systemd/nfs-config.service @@ -10,4 +10,4 @@ Type=oneshot # incorporated. Having "RemainAfterExit=no" (the default) # ensures this happens. RemainAfterExit=no -ExecStart=/usr/lib/systemd/scripts/nfs-utils_env.sh +ExecStart=/usr/libexec/nfs-utils/nfs-utils_env.sh