Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Dec 2009 23:05:16 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r200592 - stable/8/etc
Message-ID:  <200912152305.nBFN5GlW077881@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912152305.nBFN5GlW077881>