aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc.sysinit
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2007-07-20 20:54:47 +0000
committerBill Nottingham <notting@redhat.com>2007-07-20 20:54:47 +0000
commited690f871e5464eff281296b7c28fae57573e68b (patch)
tree251d59a7ef76b0751a6a438c3cf0a01a6be20f30 /rc.d/rc.sysinit
parent5c54d5ec8905e5ce3dd4f2b2dbcca97b3e07364d (diff)
downloadinitscripts-ed690f871e5464eff281296b7c28fae57573e68b.tar
initscripts-ed690f871e5464eff281296b7c28fae57573e68b.tar.gz
initscripts-ed690f871e5464eff281296b7c28fae57573e68b.tar.bz2
initscripts-ed690f871e5464eff281296b7c28fae57573e68b.tar.xz
initscripts-ed690f871e5464eff281296b7c28fae57573e68b.zip
move quotacheck to after filesystem mounting so it actually works (#249003, <tometzky@batory.org.pl>)
also, nuke the convertquota stuff that has been obsolete (and not working) for quite some time
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-xrc.d/rc.sysinit25
1 files changed, 5 insertions, 20 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f5d1078f..08d84653 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -690,26 +690,6 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
fi
fi
-# Update quotas if necessary
-if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then
- if [ -x /sbin/convertquota ]; then
- # try to convert old quotas
- for mountpt in `LC_ALL=C awk '$4 ~ /quota/{print $2}' /etc/mtab` ; do
- mountpt="$(fstab_decode_str "$mountpt")"
- if [ -f "$mountpt/quota.user" ]; then
- action $"Converting old user quota files: " \
- /sbin/convertquota -u "$mountpt" && \
- rm -f "$mountpt/quota.user"
- fi
- if [ -f "$mountpt/quota.group" ]; then
- action $"Converting old group quota files: " \
- /sbin/convertquota -g "$mountpt" && \
- rm -f "$mountpt/quota.group"
- fi
- done
- fi
- action $"Checking local filesystem quotas: " /sbin/quotacheck -aRnug
-fi
# Remount the root filesystem read-write.
update_boot_stage RCmountfs
@@ -747,6 +727,11 @@ mount -f /proc/bus/usb >/dev/null 2>&1
# filesystems are NOT unmounted in single user mode.
action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev
+# Update quotas if necessary
+if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then
+ action $"Checking local filesystem quotas: " /sbin/quotacheck -anug
+fi
+
if [ -x /sbin/quotaon ]; then
action $"Enabling local filesystem quotas: " /sbin/quotaon -aug
fi