diff options
| -rwxr-xr-x | rc.d/init.d/halt | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index dc7bf0fc..39e1febd 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -123,7 +123,7 @@ SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps` [ -x /sbin/accton ] && runcmd $"Turning off accounting: " /sbin/accton -[ -x /sbin/quotaoff ] && runcmd $"Turning off quotas: " /sbin/quotaoff -a +[ -x /sbin/quotaoff ] && runcmd $"Turning off quotas: " /sbin/quotaoff -aug # Unmount file systems, killing processes if we have to. # Unmount loopback stuff first diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 5fbc0c1e..9b0a628b 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -83,7 +83,7 @@ CLOCKFLAGS="$CLOCKFLAGS --hctosys" case "$UTC" in yes|true) - CLOCKFLAGS="$CLOCKFLAGS -u"; + CLOCKFLAGS="$CLOCKFLAGS --utc"; CLOCKDEF="$CLOCKDEF (utc)"; ;; no|false) @@ -94,17 +94,18 @@ esac case "$ARC" in yes|true) - CLOCKFLAGS="$CLOCKFLAGS -A"; + CLOCKFLAGS="$CLOCKFLAGS --arc"; CLOCKDEF="$CLOCKDEF (arc)"; ;; esac case "$SRM" in yes|true) - CLOCKFLAGS="$CLOCKFLAGS -S"; + CLOCKFLAGS="$CLOCKFLAGS --srm"; CLOCKDEF="$CLOCKDEF (srm)"; ;; esac +/sbin/hwclock --adjust /sbin/hwclock $CLOCKFLAGS action $"Setting clock $CLOCKDEF: `date`" date @@ -303,7 +304,7 @@ if [ X"$_RUN_QUOTACHECK" = X1 -a \ /sbin/convertquota -g / && rm -f /quota.group fi fi - action $"Checking root filesystem quotas: " /sbin/quotacheck -n / + action $"Checking root filesystem quotas: " /sbin/quotacheck -nug / fi # check for arguments passed from kernel @@ -590,11 +591,11 @@ if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then fi done fi - action $"Checking local filesystem quotas: " /sbin/quotacheck -aR + action $"Checking local filesystem quotas: " /sbin/quotacheck -aRnug fi if [ -x /sbin/quotaon ]; then - action $"Enabling local filesystem quotas: " /sbin/quotaon -a + action $"Enabling local filesystem quotas: " /sbin/quotaon -aug fi # Turn on process accounting |