Merge in all the changes that Mike Makonnen has been maintaining for a

while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson

1 files changed, 17 insertions, 6 deletions

diff --git a/etc/rc.d/quota b/etc/rc.d/quota
index 8f63255..a225880 100755
--- a/etc/rc.d/quota
+++ b/etc/rc.d/quota
@@ -1,23 +1,34 @@
 #!/bin/sh
 #
-# $NetBSD: quota,v 1.1.1.1 2000/03/10 11:53:24 lukem Exp $
+# $FreeBSD$
+#
+
+# Enable/Check the quotas (must be after ypbind if using NIS)
 #
 
 # PROVIDE: quota
-# REQUIRE: mountall
+# REQUIRE: mountcritremote
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
 
 . /etc/rc.subr
 
 name="quota"
+rcvar="enable_quotas"
 start_cmd="quota_start"
 stop_cmd="/usr/sbin/quotaoff -a"
 
 quota_start()
 {
-	echo -n "Checking quotas:"
-	/usr/sbin/quotacheck -a
-	echo " done."
-	/usr/sbin/quotaon -a
+	if checkyesno check_quotas ; then 
+		echo -n 'Checking quotas:'
+		quotacheck -a
+		echo ' done.'
+	fi
+
+	echo -n 'Enabling quotas:'
+	quotaon -a
+	echo ' done.'
 }
 
 load_rc_config $name