From owner-svn-src-all@FreeBSD.ORG Sat Nov 7 23:37:29 2009 Return-Path: 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 C5749106566B; Sat, 7 Nov 2009 23:37:29 +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 B40A68FC0C; Sat, 7 Nov 2009 23:37:29 +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 nA7NbT25067124; Sat, 7 Nov 2009 23:37:29 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA7NbTE0067122; Sat, 7 Nov 2009 23:37:29 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200911072337.nA7NbTE0067122@svn.freebsd.org> From: Doug Barton Date: Sat, 7 Nov 2009 23:37:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199032 - stable/7/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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2009 23:37:29 -0000 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=