svn commit: r197790 - head/etc

[Hiroki Sato]

Author: hrs
Date: Mon Oct  5 20:11:33 2009
New Revision: 197790
URL: http://svn.freebsd.org/changeset/base/197790

Log:
  Fix a case when both ${name}_program and ${command} are defined.
  
  Spotted by:	Michio "Karl" Jinbo

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Mon Oct  5 19:56:56 2009	(r197789)
+++ head/etc/rc.subr	Mon Oct  5 20:11:33 2009	(r197790)
@@ -602,7 +602,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=