From: J William Piggott <elseifthen@gmx.com>
Date: Sat, 18 Nov 2017 01:25:40 +0000 (-0500)
Subject: hwclock: fix debug regression
X-Git-Tag: v2.32-rc1~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af54dbd929266f6706a34050ed51e5114f520f59;p=thirdparty%2Futil-linux.git

hwclock: fix debug regression

commit f0a0ce7 makes debug mode implicit for the --test option.

Using the previous command syntax of --test and --debug
together invokes the undocumented Level 2 debugging when
setting the RTC. This can cause many thousands of lines of
output like:
1510967983.499968 < 1510967983.500000 (-0.000032)

Fix: bump Level 2 debugging to Level 9, just before the
other undocumented Level 10. This makes it improbable for
the development debug levels to be accessed unintentionally.

Signed-off-by: J William Piggott <elseifthen@gmx.com>
---

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 8ff33474e0..e5f90a44e9 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -494,7 +494,7 @@ set_hardware_clock_exact(const struct hwclock_control *ctl,
 			/* The retarget is handled at the end of the loop. */
 		} else if (deltavstarget < 0) {
 			/* deltavstarget < 0 if current time < target time */
-			if (ctl->debug >= 2)
+			if (ctl->debug >= 9)
 				printf(_("%ld.%06ld < %ld.%06ld (%.6f)\n"),
 				       nowsystime.tv_sec,
 				       nowsystime.tv_usec,