diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-03-20 10:50:22 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-03-20 10:50:22 -0400 |
| commit | 1b76162517a5e742201e7c7974a2d6e0d437f789 (patch) | |
| tree | 6aed07b11cf957f5787b289aa2bfa9e8a213ba34 /rc.d | |
| parent | 978244967a35c469d84da7c10826ab730c6b2856 (diff) | |
| download | initscripts-1b76162517a5e742201e7c7974a2d6e0d437f789.tar initscripts-1b76162517a5e742201e7c7974a2d6e0d437f789.tar.gz initscripts-1b76162517a5e742201e7c7974a2d6e0d437f789.tar.bz2 initscripts-1b76162517a5e742201e7c7974a2d6e0d437f789.tar.xz initscripts-1b76162517a5e742201e7c7974a2d6e0d437f789.zip | |
don't use /etc/sysconfig/clock (#438337)
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; } |