From owner-svn-src-all@FreeBSD.ORG  Sat Apr 23 17:37:14 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 A86D51065675;
	Sat, 23 Apr 2011 17:37:14 +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 9E18A8FC12;
	Sat, 23 Apr 2011 17:37:14 +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 p3NHbEJa097357;
	Sat, 23 Apr 2011 17:37:14 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3NHbECD097355;
	Sat, 23 Apr 2011 17:37:14 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104231737.p3NHbECD097355@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 23 Apr 2011 17:37:14 +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: r220974 - head/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 &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: Sat, 23 Apr 2011 17:37:14 -0000

Author: dougb
Date: Sat Apr 23 17:37:14 2011
New Revision: 220974
URL: http://svn.freebsd.org/changeset/base/220974

Log:
  As previously advertised, remove the error message for enable_quotas
  prior to 9.0-RELEASE.
  
  This change should not be MFC'ed.

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Sat Apr 23 17:15:10 2011	(r220973)
+++ head/etc/rc.subr	Sat Apr 23 17:37:14 2011	(r220974)
@@ -1060,10 +1060,6 @@ load_rc_config()
 		. /etc/rc.conf.d/"$_name"
 	fi
 
-	# Old variable name support -- Remove before 9.0-RELEASE
-	#
-	[ -n "$enable_quotas" ] && err 1 "enable_quotas is deprecated, use quota_enable"
-
 	# Set defaults if defined.
 	for _var in $rcvar $rcvars; do
 		_defval=`eval echo "\\\$${_var}_defval"`