diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-07-20 20:54:47 +0000 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2010-09-13 15:46:40 +0200 |
| commit | 52dfb70cd860e4d0fd51e37e30a081fd197f1b74 (patch) | |
| tree | fa4bc1619588aaac3b8065b1e7a6350b1e3c4b65 | |
| parent | 873660981a5a42a6de411e04958a4f204704efe1 (diff) | |
| download | initscripts-52dfb70cd860e4d0fd51e37e30a081fd197f1b74.tar initscripts-52dfb70cd860e4d0fd51e37e30a081fd197f1b74.tar.gz initscripts-52dfb70cd860e4d0fd51e37e30a081fd197f1b74.tar.bz2 initscripts-52dfb70cd860e4d0fd51e37e30a081fd197f1b74.tar.xz initscripts-52dfb70cd860e4d0fd51e37e30a081fd197f1b74.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
| -rwxr-xr-x | rc.d/rc.sysinit | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 6b7674f7..6a363346 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -688,26 +688,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_needed() { local state oldifs @@ -760,6 +740,11 @@ else action $"Mounting local filesystems: " mount -a -n -t nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev fi +# 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 |