From: J William Piggott Date: Mon, 31 Jul 2017 13:20:58 +0000 (-0400) Subject: hwclock: restore select() timeout warning X-Git-Tag: v2.31-rc1~144^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbf12e45f8b60a22e081993b4d3612d0e7f1805e;p=thirdparty%2Futil-linux.git hwclock: restore select() timeout warning hwclock now exits on select(2) timeout so restore the warning. Reverts commit ab8f402952301106ad0bd5c5a51dc8646d1bff64 and commit efc4eaf4229f78f14430d8739ddef2c5101f05cc Except use warnx(), because select() timeout does not set errno. Signed-off-by: J William Piggott --- diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c index c738076653..a660e32bab 100644 --- a/sys-utils/hwclock-rtc.c +++ b/sys-utils/hwclock-rtc.c @@ -288,9 +288,8 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl) if (0 < rc) ret = 0; else if (rc == 0) { - if (ctl->debug) - printf(_("select() to %s to wait for clock tick timed out"), - rtc_dev_name); + warnx(_("select() to %s to wait for clock tick timed out"), + rtc_dev_name); } else warn(_("select() to %s to wait for clock tick failed"), rtc_dev_name);