diff options
| -rwxr-xr-x | rc.d/rc.sysinit | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 72d92663..acd2b5fa 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -60,9 +60,6 @@ if [ ! -f /fastboot ]; then mount -n -o remount,ro / echo "Automatic reboot in progress." reboot - elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then - echo "Checking root filesystem quotas" - /sbin/quotacheck -v / fi fi @@ -94,6 +91,12 @@ fi echo "Remounting root filesystem in read-write mode." mount -n -o remount,rw / +# Check quotas if fsck fixed something. +if [ "$rc" = "1" -a -x /sbin/quotacheck ]; then + echo "Checking root filesystem quotas" + /sbin/quotacheck -v / +fi + if [ ! -f /etc/HOSTNAME ]; then echo ${HOSTNAME} > /etc/HOSTNAME fi @@ -211,9 +214,6 @@ if [ ! -f /fastboot ]; then mount -n -o remount,ro / echo "Automatic reboot in progress." reboot - elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then - echo "Checking filesystem quotas" - /sbin/quotacheck -v -R -a fi fi @@ -228,6 +228,12 @@ if [ -x /sbin/setsysfont ]; then /sbin/setsysfont fi +# Check quotas if fsck fixed something. +if [ "$rc" = "1" -a -x /sbin/quotacheck ]; then + echo "Checking filesystem quotas" + /sbin/quotacheck -v -R -a +fi + if [ -x /sbin/quotaon ]; then echo "Turning on user and group quotas for local filesystems" /sbin/quotaon -a @@ -329,4 +335,7 @@ fi dmesg > /var/log/dmesg # Feed entropy into the entropy pool +# XXX Random is also started as S20random but randomization may be needed +# XXX for packet sequence numbers during network initialization so we'll +# XXX add entropy here too. /etc/rc.d/init.d/random start |