Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Nov 2009 23:37:29 +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-7@freebsd.org
Subject:   svn commit: r199032 - stable/7/etc
Message-ID:  <200911072337.nA7NbTE0067122@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sat Nov  7 23:37:29 2009
New Revision: 199032
URL: http://svn.freebsd.org/changeset/base/199032

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/7/etc/rc.subr
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/rc.subr
==============================================================================
--- stable/7/etc/rc.subr	Sat Nov  7 23:24:17 2009	(r199031)
+++ stable/7/etc/rc.subr	Sat Nov  7 23:37:29 2009	(r199032)
@@ -565,7 +565,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?200911072337.nA7NbTE0067122>