diff options
| author | Daniel Drake | 2011-02-21 14:27:07 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-02-21 17:07:57 +0100 |
| commit | 7894bf0f08740f75610990a2ba76af7a7cbce61e (patch) | |
| tree | 32fc43c7a594549427c83af12a6e1c556b5fa61e | |
| parent | cfdisk: fix compiler warning (diff) | |
| download | kernel-qcow2-util-linux-7894bf0f08740f75610990a2ba76af7a7cbce61e.tar.gz kernel-qcow2-util-linux-7894bf0f08740f75610990a2ba76af7a7cbce61e.tar.xz kernel-qcow2-util-linux-7894bf0f08740f75610990a2ba76af7a7cbce61e.zip | |
hwclock: make RTC default to UTC time
If /etc/adjtime doesn't specify UTC or LOCAL, rtcwake defaults to UTC
and hwclock defaults to LOCAL.
Switch hwclock to meet the behaviour of rtcwake (default=UTC), also
matching the kernel's CONFIG_RTC_HCTOSYS behaviour.
The user impact of this change should be minimal, as anyone who has run
"hwclock --systohc" before will have their UTC/LOCAL choice already
recorded in /etc/adjtime.
Signed-off-by: Daniel Drake <dsd@laptop.org>
| -rw-r--r-- | hwclock/hwclock.8 | 2 | ||||
| -rw-r--r-- | hwclock/hwclock.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8 index 31f769292..b693ae2b1 100644 --- a/hwclock/hwclock.8 +++ b/hwclock/hwclock.8 @@ -169,7 +169,7 @@ was used to set the clock (i.e. hwclock was successfully run with the or .B \-\-adjust options), as recorded in the adjtime file. If the adjtime file doesn't -exist, the default is local time. +exist, the default is UTC time. .TP .B \-\-noadjfile diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c index 279b672f9..88fb8a073 100644 --- a/hwclock/hwclock.c +++ b/hwclock/hwclock.c @@ -224,8 +224,8 @@ hw_clock_is_utc(const bool utc, const bool local_opt, else if (local_opt) ret = FALSE; /* --localtime explicitly given */ else - /* get info from adjtime file - default is local */ - ret = (adjtime.local_utc == UTC); + /* get info from adjtime file - default is UTC */ + ret = (adjtime.local_utc != LOCAL); if (debug) printf(_("Assuming hardware clock is kept in %s time.\n"), ret ? _("UTC") : _("local")); |