From owner-svn-src-head@FreeBSD.ORG Tue Jun 28 14:26:35 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43671106564A; Tue, 28 Jun 2011 14:26:35 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 339798FC19; Tue, 28 Jun 2011 14:26:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5SEQZSY053224; Tue, 28 Jun 2011 14:26:35 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5SEQZ5H053222; Tue, 28 Jun 2011 14:26:35 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201106281426.p5SEQZ5H053222@svn.freebsd.org> From: Sergey Kandaurov Date: Tue, 28 Jun 2011 14:26:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223644 - head/etc/rc.d X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jun 2011 14:26:35 -0000 Author: pluknet Date: Tue Jun 28 14:26:34 2011 New Revision: 223644 URL: http://svn.freebsd.org/changeset/base/223644 Log: Run load_rc_config before stop_cmd definition, so that ${quotaoff_flags} is correctly expanded inside stop_cmd instead of getting nothing. PR: conf/157687 Reported by: Dmitry Banschikov MFC after: 1 week Modified: head/etc/rc.d/quota Modified: head/etc/rc.d/quota ============================================================================== --- head/etc/rc.d/quota Tue Jun 28 14:10:39 2011 (r223643) +++ head/etc/rc.d/quota Tue Jun 28 14:26:34 2011 (r223644) @@ -14,6 +14,7 @@ name="quota" rcvar=`set_rcvar` +load_rc_config $name start_cmd="quota_start" stop_cmd="/usr/sbin/quotaoff ${quotaoff_flags}" @@ -30,5 +31,4 @@ quota_start() echo ' done.' } -load_rc_config $name run_rc_command "$1"