From: J William Piggott <elseifthen@gmx.com>
Date: Sat, 15 Jul 2017 20:01:13 +0000 (-0400)
Subject: hwclock: improve RTC epoch messages
X-Git-Tag: v2.31-rc1~194^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c26ddc568f3fb26b45a22cbf89d3294113e70377;p=thirdparty%2Futil-linux.git

hwclock: improve RTC epoch messages

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

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 445d736358..423ebcd016 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1172,23 +1172,17 @@ manipulate_epoch(const struct hwclock_control *ctl)
 		unsigned long epoch;
 
 		if (get_epoch_rtc(ctl, &epoch))
-			warnx(_
-			      ("Unable to get the epoch value from the kernel."));
+			warnx(_("unable to read the RTC epoch."));
 		else
-			printf(_("Kernel is assuming an epoch value of %lu\n"),
-			       epoch);
+			printf(_("The RTC epoch is set to %lu.\n"), epoch);
 	} else if (ctl->setepoch) {
 		if (!ctl->epoch_option)
-			warnx(_
-			      ("To set the epoch value, you must use the 'epoch' "
-			       "option to tell to what value to set it."));
+			warnx(_("--epoch is required for --setepoch."));
 		else if (ctl->testing)
-			printf(_
-			       ("Not setting the epoch to %s - testing only.\n"),
+			printf(_("Test mode: epoch was not set to %s.\n"),
 			       ctl->epoch_option);
 		else if (set_epoch_rtc(ctl))
-			printf(_
-			       ("Unable to set the epoch value in the kernel.\n"));
+			warnx(_("unable to set the RTC epoch."));
 	}
 }
 #endif		/* __linux__ __alpha__ */