From 92cbc62e1c1b22c6cc251628e8d51a45607998b6 Mon Sep 17 00:00:00 2001 From: Gerhard Brauer Date: Fri, 26 Jun 2009 10:52:09 -0700 Subject: Don't change hardwareclock if settings unclear Don't default to 'localtime' if HARDWARECLOCK is not set to UTC. Check explicit values Ref: FS#15263 Edited-by: Aaron Griffin Signed-off-by: Aaron Griffin --- rc.shutdown | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rc.shutdown b/rc.shutdown index 1143c16..d366423 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -73,13 +73,17 @@ fi HWCLOCK_PARAMS="--systohc" if [ "$HARDWARECLOCK" = "UTC" ]; then HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc" -else +elif HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime" +else + HWCLOCK_PARAMS="" fi if [ "$USEDIRECTISA" = "yes" -o "$USEDIRECTISA" = "YES" ]; then HWCLOCK_PARAMS="$HWCLOCK_PARAMS --directisa" fi -/sbin/hwclock $HWCLOCK_PARAMS +if [ "$HWCLOCK_PARAMS" != "" ]; then + /sbin/hwclock $HWCLOCK_PARAMS +fi stat_done # removing psmouse module to fix some reboot issues on newer laptops -- cgit v1.2.3