Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Nov 2009 22:59:04 +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: r199029 - stable/8/etc
Message-ID:  <200911072259.nA7Mx4wY066168@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sat Nov  7 22:59:04 2009
New Revision: 199029
URL: http://svn.freebsd.org/changeset/base/199029

Log:
  MFC r198162:
  
  Allow $name_program to override $command in a more robust way that
  will not cause the value to be null if $command is not set.

Modified:
  stable/8/etc/rc.subr
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/rc.subr
==============================================================================
--- stable/8/etc/rc.subr	Sat Nov  7 22:47:12 2009	(r199028)
+++ stable/8/etc/rc.subr	Sat Nov  7 22:59:04 2009	(r199029)
@@ -588,7 +588,7 @@ run_rc_command()
 	esac
 
 	eval _override_command=\$${name}_program
-	command=${command:+${_override_command:-$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?200911072259.nA7Mx4wY066168>