summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1997-07-31 02:23:47 +0000
committerJason Downs <downsj@cvs.openbsd.org>1997-07-31 02:23:47 +0000
commit64f9ad97f24717a55133a4d2ab2bd190f38ece4e (patch)
tree84245f762314b56d683ca026180b6cd277b26254
parentb55b198a331cc10ef50bfa52817aea05698b082c (diff)
Make quotas optional; wedged into netstart for the time being.
/etc/rc.conf, anyone?
-rw-r--r--etc/netstart3
-rw-r--r--etc/rc12
2 files changed, 9 insertions, 6 deletions
diff --git a/etc/netstart b/etc/netstart
index 654e99fe6cd..fb08c712f74 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.25 1997/07/30 21:35:15 deraadt Exp $
+# $OpenBSD: netstart,v 1.26 1997/07/31 02:23:46 downsj Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for 'normal' use: routed_flags=-q
@@ -25,6 +25,7 @@ nat=NO
portmap=YES # almost always needed
inetd=YES # almost always needed
lpd=NO # printing daemons
+check_quotas=YES # NO may be desireable in some YP environments
# miscellaneous other flags
# only used if the appropriate server is marked YES above
diff --git a/etc/rc b/etc/rc
index 4b311de930e..d101224391c 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.40 1997/07/25 00:06:02 provos Exp $
+# $OpenBSD: rc,v 1.41 1997/07/31 02:23:45 downsj Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -192,10 +192,12 @@ if [ -d /var/crash ]; then
savecore /var/crash
fi
- echo -n 'checking quotas:'
-quotacheck -a
- echo ' done.'
-quotaon -a
+if [ "X${check_quotas}" = X"YES" ]; then
+ echo -n 'checking quotas:'
+ quotacheck -a
+ echo ' done.'
+ quotaon -a
+fi
# build ps databases
echo 'building databases...'