rc.d: rename vfs_accounting to vfs_quota

Rename the rc.d vfs_accounting_* variables to vfs_quota_* as well

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index f6b27a5..4646c69 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -2029,6 +2029,7 @@ TO_REMOVE+=/usr/share/man/man3/puffs_fuse_unlink.3.gz
 TO_REMOVE+=/usr/include/netgraph7/ng_tty.h
 TO_REMOVE+=/etc/pam.d/gdm
 TO_REMOVE+=/etc/pam.d/kde
+TO_REMOVE+=/etc/rc.d/vfs_accounting
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 5bb6715..af6aca5 100644 (file)
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -426,11 +426,11 @@ jail_sysvipc_allow="NO"   # Allow SystemV IPC use from within a jail
 #jail_example_flags="-l -U root"               # flags for jail(8)
 
 ##############################################################
-###  VFS accounting options ##################################
+###  VFS quota options #######################################
 ##############################################################
 
-vfs_accounting_enable="NO" # Set to YES to enable handling of these vfs accounting options
-vfs_accounting_sync=""     # Space separated list of mount points or "NO"
+vfs_quota_enable="NO" # Set to YES to enable handling of these vfs quota options
+vfs_quota_sync=""     # Space separated list of mount points or "NO"
 
 ##############################################################
 ###  VKernel options #########################################

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index ca14e01..b8fdb06 100644 (file)
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -22,7 +22,7 @@ FILES=        DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz \
        routing rpcbind rtadvd rtsold rwho sysdb savecore sdpd securelevel \
        sendmail sensorsd serial sppp sshd statd swap1 syscons sysctl syslogd \
        timed ttys udevd udevd_early usbd \
-       varsym vfs_accounting vinum virecover vkernel vknetd \
+       varsym vfs_quota vinum virecover vkernel vknetd \
        watchdogd wpa_supplicant \
        ypbind yppasswdd ypserv ypset ypupdated ypxfrd
 

diff --git a/etc/rc.d/vfs_accounting b/etc/rc.d/vfs_quota
similarity index 56%
rename from etc/rc.d/vfs_accounting
rename to etc/rc.d/vfs_quota
index 58436aa..2f31a9a 100644 (file)
--- a/etc/rc.d/vfs_accounting
+++ b/etc/rc.d/vfs_quota
@@ -1,26 +1,26 @@
 #!/bin/sh
 
-# PROVIDE: vfs_accounting
+# PROVIDE: vfs_quota
 # REQUIRE: mountcritlocal
 # BEFORE:  LOGIN
 
 . /etc/rc.subr
 
-name="vfs_accounting"
+name="vfs_quota"
 rcvar=`set_rcvar`
-start_cmd="vas_start"
+start_cmd="vq_start"
 
-vas_start()
+vq_start()
 {
-       if checkyesno vfs_accounting_enable; then
-               # For each dir in $vfs_accounting_sync, run vquota sync
+       if checkyesno vfs_quota_enable; then
+               # For each dir in $vfs_quota_sync, run vquota sync
                #
-               case ${vfs_accounting_sync} in
+               case ${vfs_quota_sync} in
                [Nn][Oo] | '')
                        ;;
                *)
                        echo -n 'Synchronizing VFS counters: '
-                       for dir in ${vfs_accounting_sync}; do
+                       for dir in ${vfs_quota_sync}; do
                                echo -n "${dir} "
                                if [ -d "${dir}" ]; then
                                        /sbin/vquota sync ${dir}

diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 0ce8d24..7678e7d 100644 (file)
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -2594,12 +2594,12 @@ has not completed within the specified time (in seconds).
 If set to
 .Dq Li YES ,
 the udevd daemon will be started on boot.
-.It Va vfs_accounting_enable
+.It Va vfs_quota_enable
 .Pq Vt bool
 If set to
 .Dq Li YES ,
-vfs accounting rc.d scripts will be run on boot.
-.It Va vfs_accounting_sync
+vfs quota rc.d scripts will be run on boot.
+.It Va vfs_quota_sync
 .Pq Vt str
 List of mount points whose counters are to be synchronized with on-disk
 usage during system startup. See also