diff options
| author | J William Piggott | 2017-08-09 02:50:55 +0200 |
|---|---|---|
| committer | J William Piggott | 2017-08-25 00:30:39 +0200 |
| commit | b44dd522b4ca603f68f90577755bbd5538c0542f (patch) | |
| tree | ccf14893ef035242065e6ccd33bf257084191c37 | |
| parent | hwclock: remove set_system_clock_timezone() (diff) | |
| download | kernel-qcow2-util-linux-b44dd522b4ca603f68f90577755bbd5538c0542f.tar.gz kernel-qcow2-util-linux-b44dd522b4ca603f68f90577755bbd5538c0542f.tar.xz kernel-qcow2-util-linux-b44dd522b4ca603f68f90577755bbd5538c0542f.zip | |
hwclock: update set_system_clock debugging
Update debug messages for a combined --systz and --hctosys in
the set_system_clock function.
New debug messages:
hwclock --test -D --systz --localtime
Calling settimeofday(NULL, 240) to warp System time.
Test mode: clock was not changed
hwclock --test -D --systz --utc
Calling settimeofday(NULL, 0) to lock the warp function.
Calling settimeofday(NULL, 240) to set the kernel timezone.
Test mode: clock was not changed
hwclock --test -D --hctosys --utc
Calling settimeofday(1502239269.733639, 240)
Test mode: clock was not changed
hwclock --test -D --hctosys --localtime
Calling settimeofday(NULL, 240) to set persistent_clock_is_local.
Calling settimeofday(1502253708.200200, 240)
Test mode: clock was not changed
Signed-off-by: J William Piggott <elseifthen@gmx.com>
| -rw-r--r-- | sys-utils/hwclock.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index ddd641327..0be9c2a2d 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -606,11 +606,24 @@ set_system_clock(const struct hwclock_control *ctl, #endif if (ctl->debug) { - printf(_("Calling settimeofday:\n")); - printf(_("\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"), - newtime.tv_sec, newtime.tv_usec); - printf(_("\ttz.tz_minuteswest = %d\n"), minuteswest); + if (ctl->hctosys && !ctl->universal) + printf(_("Calling settimeofday(NULL, %d) to set " + "persistent_clock_is_local.\n"), minuteswest); + if (ctl->systz && ctl->universal) + puts(_("Calling settimeofday(NULL, 0) " + "to lock the warp function.")); + if (ctl->hctosys) + printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), + newtime.tv_sec, newtime.tv_usec, minuteswest); + else { + printf(_("Calling settimeofday(NULL, %d) "), minuteswest); + if (ctl->universal) + puts(_("to set the kernel timezone.")); + else + puts(_("to warp System time.")); + } } + if (ctl->testing) { printf(_ ("Test mode: clock was not changed\n")); |