From patchwork Fri Nov 11 20:26:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 125283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "rcsinet15.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id F23661007D8 for ; Sat, 12 Nov 2011 07:26:41 +1100 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by rcsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pABKQbgF006103 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Nov 2011 20:26:37 GMT Received: from oss.oracle.com (oss.oracle.com [141.146.12.120]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id pABKQaWM000012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 11 Nov 2011 20:26:36 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ROxgF-00076b-E0; Fri, 11 Nov 2011 12:26:31 -0800 Received: from acsinet13.oracle.com ([141.146.126.235]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ROxgD-00076U-Is for fedfs-utils-devel@oss.oracle.com; Fri, 11 Nov 2011 12:26:29 -0800 Received: from mail-iy0-f171.google.com (mail-iy0-f171.google.com [209.85.210.171]) by acsinet13.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pABKQ3Dr003474 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) for ; Fri, 11 Nov 2011 20:26:29 GMT Received: by mail-iy0-f171.google.com with SMTP id y12so1680288iab.2 for ; Fri, 11 Nov 2011 12:26:29 -0800 (PST) Received: by 10.231.29.103 with SMTP id p39mr3253793ibc.28.1321043187972; Fri, 11 Nov 2011 12:26:27 -0800 (PST) Received: from degas.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id eh34sm17387991ibb.5.2011.11.11.12.26.27 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Nov 2011 12:26:27 -0800 (PST) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Fri, 11 Nov 2011 15:26:26 -0500 Message-ID: <20111111202626.10717.44442.stgit@degas.1015granger.net> In-Reply-To: <20111111202105.10717.28436.stgit@degas.1015granger.net> References: <20111111202105.10717.28436.stgit@degas.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=ISPs ip=209.85.210.171 ct-class=G1 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=0 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=2445 Subject: [fedfs-utils] [PATCH 03/12] contrib: Use /etc/sysconfig/fedfs for rpcfedfsd init script X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-CT-RefId: str=0001.0A090209.4EBD84FE.000C:SCFSTAT1119972, ss=1, re=-4.000, fgs=0 X-Auth-Type: Internal IP Commit 612e51b9 introduces a SysV-style init script for starting rpc.fedfsd. Like other NFS-related init scripts, it looks in /etc/sysconfig/nfs for configuration information such as daemon command line options. Jeff Layton notes, however, that /etc/sysconfig/nfs is shipped as part of the nfs-utils package. To avoid an unwanted dependency on nfs-utils, "we really want a separate file here. /etc/sysconfig/fedfs would be more appropriate," he says. FedFS is supposed to be independent of underlying file system protocols, after all. Introduce a sample /etc/sysconfig/fedfs file in contrib, and update the rpcfedfsd script to use it. Signed-off-by: Chuck Lever --- contrib/init-scripts/Makefile.am | 2 +- contrib/init-scripts/fedfs | 11 +++++++++++ contrib/init-scripts/rpcfedfsd | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 contrib/init-scripts/fedfs diff --git a/contrib/init-scripts/Makefile.am b/contrib/init-scripts/Makefile.am index a168a65..d1f35a5 100644 --- a/contrib/init-scripts/Makefile.am +++ b/contrib/init-scripts/Makefile.am @@ -23,7 +23,7 @@ ## http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt ## -EXTRA_DIST = rpcfedfsd +EXTRA_DIST = fedfs rpcfedfsd CLEANFILES = cscope.in.out cscope.out cscope.po.out *~ DISTCLEANFILES = Makefile.in diff --git a/contrib/init-scripts/fedfs b/contrib/init-scripts/fedfs new file mode 100644 index 0000000..aa40100 --- /dev/null +++ b/contrib/init-scripts/fedfs @@ -0,0 +1,11 @@ +# /etc/sysconfig/fedfs +# +# This configuration file controls the behavior of the rpc.fedfsd +# daemon, part of the fedfs-utils package. For the vast majority +# of users, there shouldn't be any need to alter the contents of +# this file at all. + +# +# Optional arguments passed to rpc.fedfsd. See rpc.fedfsd(8) +# +#RPCFEDFSDARGS="--debug --uid 501 --gid 501 --port 45678" diff --git a/contrib/init-scripts/rpcfedfsd b/contrib/init-scripts/rpcfedfsd index d2bb7fe..0fcbe96 100755 --- a/contrib/init-scripts/rpcfedfsd +++ b/contrib/init-scripts/rpcfedfsd @@ -43,7 +43,7 @@ [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network # Check for, and source, configuration file; otherwise set defaults -[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs +[ -f /etc/sysconfig/fedfs ] && . /etc/sysconfig/fedfs RETVAL=0 prog="rpc.fedfsd"