From owner-svn-src-user@FreeBSD.ORG  Sun Jan  5 22:50:33 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 60C3FEB5;
 Sun,  5 Jan 2014 22:50:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3EB4D1B4D;
 Sun,  5 Jan 2014 22:50:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s05MoXVH016282;
 Sun, 5 Jan 2014 22:50:33 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05MoWBt016278;
 Sun, 5 Jan 2014 22:50:32 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201401052250.s05MoWBt016278@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Sun, 5 Jan 2014 22:50:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r260349 - in user/jmmv/autotest: . node node/rc.d
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jan 2014 22:50:33 -0000

Author: jmmv
Date: Sun Jan  5 22:50:32 2014
New Revision: 260349
URL: http://svnweb.freebsd.org/changeset/base/260349

Log:
  Rename the rc.d script to autotest_node.
  
  I don't think dashes are easily supported as the 'name' variable of an
  rc.d script, and the inconsistency between the file name and the rc.conf
  variables was confusing.  (Actually, the setup script was broken because
  it attempted to start the service using an underscore.)
  
  To prevent confusion, just rename the script to autotest_node.

Added:
  user/jmmv/autotest/node/rc.d/autotest_node.in
     - copied, changed from r260341, user/jmmv/autotest/node/rc.d/autotest-node.in
Deleted:
  user/jmmv/autotest/node/rc.d/autotest-node.in
Modified:
  user/jmmv/autotest/README
  user/jmmv/autotest/node/Makefile

Modified: user/jmmv/autotest/README
==============================================================================
--- user/jmmv/autotest/README	Sun Jan  5 22:49:54 2014	(r260348)
+++ user/jmmv/autotest/README	Sun Jan  5 22:50:32 2014	(r260349)
@@ -42,4 +42,4 @@ Of special interest are:
 * node/configs/: Configuration files for node/iterate.  node/loop picks all
   of them up and runs them in sequence.
 
-* node/rc.d/autotest-node: rc.d script to run node/loop as a daemon.
+* node/rc.d/autotest_node: rc.d script to run node/loop as a daemon.

Modified: user/jmmv/autotest/node/Makefile
==============================================================================
--- user/jmmv/autotest/node/Makefile	Sun Jan  5 22:49:54 2014	(r260348)
+++ user/jmmv/autotest/node/Makefile	Sun Jan  5 22:50:32 2014	(r260349)
@@ -11,7 +11,7 @@ SYSCONFDIR= ${.CURDIR}/configs
 SCRIPTS= iterate loop
 
 .PHONY: all
-all: ${SCRIPTS} rc.d/autotest-node
+all: ${SCRIPTS} rc.d/autotest_node
 
 .for script in ${SCRIPTS}
 ${script}: ${script}.sh
@@ -21,14 +21,14 @@ ${script}: ${script}.sh
 	    "${script}.sh" | "${SHTK}" build -o "${script}" -s "${SHELL}" -
 .endfor
 
-rc.d/autotest-node: rc.d/autotest-node.in
+rc.d/autotest_node: rc.d/autotest_node.in
 	sed -e "s,__AUTOTEST_BINDIR__,${BINDIR},g" \
 	    -e 's,__AUTOTEST_ETCDIR__,${SYSCONFDIR},g' \
 	    -e 's,__AUTOTEST_SHELL__,${SHELL},g' \
 	    -e "s,__AUTOTEST_VARBASE__,${LOCALSTATEDIR},g" \
-	    rc.d/autotest-node.in >rc.d/autotest-node
-	chmod +x rc.d/autotest-node
+	    rc.d/autotest_node.in >rc.d/autotest_node
+	chmod +x rc.d/autotest_node
 
 .PHONY: clean
 clean:
-	rm -f ${SCRIPTS} rc.d/autotest-node
+	rm -f ${SCRIPTS} rc.d/autotest_node

Copied and modified: user/jmmv/autotest/node/rc.d/autotest_node.in (from r260341, user/jmmv/autotest/node/rc.d/autotest-node.in)
==============================================================================
--- user/jmmv/autotest/node/rc.d/autotest-node.in	Sun Jan  5 22:38:44 2014	(r260341, copy source)
+++ user/jmmv/autotest/node/rc.d/autotest_node.in	Sun Jan  5 22:50:32 2014	(r260349)
@@ -23,8 +23,8 @@ PATH="/usr/local/bin:/usr/local/sbin:${P
 
 name="autotest_node"
 rcvar="autotest_node_enable"
-logfile="__AUTOTEST_VARBASE__/log/autotest-node.log"
-pidfile="__AUTOTEST_VARBASE__/run/autotest-node.pid"
+logfile="__AUTOTEST_VARBASE__/log/autotest_node.log"
+pidfile="__AUTOTEST_VARBASE__/run/autotest_node.pid"
 command="__AUTOTEST_BINDIR__/loop"
 command_interpreter="__AUTOTEST_SHELL__"
 command_args="-b -d 60 -l '${logfile}' -p '${pidfile}'"