From: J William Piggott Date: Wed, 9 Aug 2017 00:50:55 +0000 (-0400) Subject: hwclock: update set_system_clock debugging X-Git-Tag: v2.31-rc1~110 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b44dd522b4ca603f68f90577755bbd5538c0542f;p=thirdparty%2Futil-linux.git 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 --- diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index ddd641327d..0be9c2a2d2 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"));