diff options
| author | Igor Pires Soares <igorsoares@gmail.com> | 2008-03-20 19:09:18 +0000 |
|---|---|---|
| committer | Igor Pires Soares <igorsoares@gmail.com> | 2008-03-20 19:09:18 +0000 |
| commit | 57a504d475f998118ccae93c05750aefa95954da (patch) | |
| tree | a907184bbfbbf44c17adf2f420bcbcea11cbd7f5 /rc.d | |
| parent | 7cc7cc1cc78aca89b7d943a4fb119a526b496f63 (diff) | |
| parent | 1b76162517a5e742201e7c7974a2d6e0d437f789 (diff) | |
| download | initscripts-57a504d475f998118ccae93c05750aefa95954da.tar initscripts-57a504d475f998118ccae93c05750aefa95954da.tar.gz initscripts-57a504d475f998118ccae93c05750aefa95954da.tar.bz2 initscripts-57a504d475f998118ccae93c05750aefa95954da.tar.xz initscripts-57a504d475f998118ccae93c05750aefa95954da.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/halt | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index ce6b24b1..2eb77582 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -99,34 +99,7 @@ if [ -f /etc/sysconfig/clock ]; then fi fi -CLOCKDEF="" -CLOCKFLAGS="$CLOCKFLAGS --systohc" - -case "$UTC" in - yes|true) - CLOCKFLAGS="$CLOCKFLAGS -u"; - CLOCKDEF="$CLOCKDEF (utc)"; - ;; - no|false) - CLOCKFLAGS="$CLOCKFLAGS --localtime"; - CLOCKDEF="$CLOCKDEF (localtime)"; - ;; -esac - -case "$ARC" in - yes|true) - CLOCKFLAGS="$CLOCKFLAGS -A"; - CLOCKDEF="$CLOCKDEF (arc)"; - ;; -esac -case "$SRM" in - yes|true) - CLOCKFLAGS="$CLOCKFLAGS -S"; - CLOCKDEF="$CLOCKDEF (srm)"; - ;; -esac - -[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS +[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock --systohc # Try to unmount tmpfs filesystems to avoid swapping them in. Ignore failures. tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; } |