From owner-svn-src-all@FreeBSD.ORG  Tue Dec 15 23:05:16 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBFA91065692;
	Tue, 15 Dec 2009 23:05:16 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA58F8FC16;
	Tue, 15 Dec 2009 23:05:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBFN5GgL077883;
	Tue, 15 Dec 2009 23:05:16 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBFN5GlW077881;
	Tue, 15 Dec 2009 23:05:16 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912152305.nBFN5GlW077881@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 15 Dec 2009 23:05:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200592 - stable/8/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2009 23:05:17 -0000

Author: dougb
Date: Tue Dec 15 23:05:16 2009
New Revision: 200592
URL: http://svn.freebsd.org/changeset/base/200592

Log:
  Re-apply the fix from r199029 (MFC from r198162) to allow
  $name_program to override $command.
  
  PR:		conf//141642
  Submitted by:	Petr Lampa <lampa@fit.vutbr.cz>

Modified:
  stable/8/etc/rc.subr

Modified: stable/8/etc/rc.subr
==============================================================================
--- stable/8/etc/rc.subr	Tue Dec 15 22:44:28 2009	(r200591)
+++ stable/8/etc/rc.subr	Tue Dec 15 23:05:16 2009	(r200592)
@@ -616,7 +616,7 @@ run_rc_command()
 	esac
 
 	eval _override_command=\$${name}_program
-	command=${command:-${_override_command}}
+	command=${_override_command:-$command}
 
 	_keywords="start stop restart rcvar $extra_commands"
 	rc_pid=