diff options
| author | billf <billf@FreeBSD.org> | 1999-03-17 04:00:04 +0000 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 1999-03-17 04:00:04 +0000 |
| commit | 544adda3ecf0eb5f9bbe85bada85b8c67c896618 (patch) | |
| tree | 6f8422e456f0f09bcbdacf2e071d7fbc3a724f06 /etc | |
| parent | c4dc16bbe80ed90b1cff86bf9eb18bb30bcf21f1 (diff) | |
| download | FreeBSD-src-544adda3ecf0eb5f9bbe85bada85b8c67c896618.zip FreeBSD-src-544adda3ecf0eb5f9bbe85bada85b8c67c896618.tar.gz | |
Split check_quotas into check_quotas and enable_quotas
enable_quotas - use quotas on your system
check_quotas - check for violations on startup
By assuming that a system was neat and without violation before it booted
we can skip a long (and at that point needless) process.
Submitted by: Alex Perel <veers@disturbed.net>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 5 | ||||
| -rw-r--r-- | etc/rc | 21 |
2 files changed, 17 insertions, 9 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index ca09312..ee7b840 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -9,7 +9,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.2 1999/03/03 15:04:33 phk Exp $ +# $Id: rc.conf,v 1.3 1999/03/11 16:17:24 jfitz Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -186,7 +186,8 @@ usbd_flags="" # Flags to usbd (if enabled). sendmail_enable="YES" # Run the sendmail daemon (or NO). sendmail_flags="-bd -q30m" # Flags to sendmail (if enabled) dumpdev="NO" # Device name to crashdump to (if enabled). -check_quotas="NO" # Check quotas (or NO). +enable_quotas="NO" # turn on quotas on startup (or NO). +check_quotas="NO" # Check quotas on startup (or NO). accounting_enable="NO" # Turn on process accounting (or NO). ibcs2_enable="NO" # Ibcs2 (SCO) emulation loaded at startup (or NO). linux_enable="NO" # Linux emulation loaded at startup (or NO). @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.181 1999/03/14 03:20:22 des Exp $ +# $Id: rc,v 1.182 1999/03/14 20:26:39 des Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -233,12 +233,19 @@ if [ -n "$network_pass1_done" ]; then network_pass2 fi -# Check the quotas (must be after ypbind if using NIS) -if [ "X${check_quotas}" = X"YES" ]; then - echo -n 'checking quotas:' - quotacheck -a - echo ' done.' - quotaon -a +# Enable/Check the quotas (must be after ypbind if using NIS) +if [ "X${enable_quotas}" = X"YES" ]; then + + # Only check quotas if they have been previously enabled, and requested + if [ "X${check_quotas}" = X"YES" ]; then + echo -n 'checking quotas:' + quotacheck -a + echo ' done.' + fi + + echo -n 'enabling quotas:' + quotaon -a + echo ' done.' fi if [ -n "$network_pass2_done" ]; then |
