summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/defaults/rc.conf2
-rwxr-xr-xetc/rc.d/quota2
-rw-r--r--etc/rc.subr4
3 files changed, 6 insertions, 2 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 177f4d5..357c45e 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -528,7 +528,7 @@ chkprintcap_flags="-d" # Create missing directories by default.
dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO).
dumpdir="/var/crash" # Directory where crash dumps are to be stored
savecore_flags="" # Used if dumpdev is enabled above, and present.
-enable_quotas="NO" # turn on quotas on startup (or NO).
+quota_enable="NO" # turn on quotas on startup (or NO).
check_quotas="YES" # Check quotas on startup (or NO).
quotaon_flags="-a" # Turn quotas on for all file systems (if enabled)
quotaoff_flags="-a" # Turn quotas off for all file systems at shutdown
diff --git a/etc/rc.d/quota b/etc/rc.d/quota
index 2a1a2de..01d9802 100755
--- a/etc/rc.d/quota
+++ b/etc/rc.d/quota
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="quota"
-rcvar="enable_quotas"
+rcvar=`set_rcvar`
start_cmd="quota_start"
stop_cmd="/usr/sbin/quotaoff ${quotaoff_flags}"
diff --git a/etc/rc.subr b/etc/rc.subr
index 341f3c8..15377b0 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -942,6 +942,10 @@ load_rc_config()
debug "Sourcing /etc/rc.conf.d/${_name}"
. /etc/rc.conf.d/"$_name"
fi
+
+ # Old variable names support
+ #
+ [ -n "$enable_quotas" ] && quota_enable="$enable_quotas"
}
#
OpenPOWER on IntegriCloud