From owner-svn-src-all@FreeBSD.ORG  Tue Jul  5 10:37:17 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 DDFA0106566C;
	Tue,  5 Jul 2011 10:37:17 +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 CD6DB8FC0A;
	Tue,  5 Jul 2011 10:37:17 +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 p65AbHmC059047;
	Tue, 5 Jul 2011 10:37:17 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p65AbH0R059045;
	Tue, 5 Jul 2011 10:37:17 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201107051037.p65AbH0R059045@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 5 Jul 2011 10:37:17 +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: r223784 - stable/7/etc/rc.d
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2011 10:37:18 -0000

Author: pluknet
Date: Tue Jul  5 10:37:17 2011
New Revision: 223784
URL: http://svn.freebsd.org/changeset/base/223784

Log:
  MFC r223644:
  
  Run load_rc_config early to fix quota knobs expansion.
  
  PR:		conf/157687

Modified:
  stable/7/etc/rc.d/quota
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/rc.d/quota
==============================================================================
--- stable/7/etc/rc.d/quota	Tue Jul  5 10:21:06 2011	(r223783)
+++ stable/7/etc/rc.d/quota	Tue Jul  5 10:37:17 2011	(r223784)
@@ -14,6 +14,7 @@
 
 name="quota"
 rcvar="enable_quotas"
+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"