summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-08-27 00:15:01 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-08-27 00:15:01 (GMT)
commit74c992af5c6b8cfe6214e705bc04f8c2f9d8a304 (patch)
tree0a47255194456a017a4c1b34257851e75514fa51
parent1cd0d8600524de01d643db32bc05f4d4d0c30436 (diff)
downloadbusybox-74c992af5c6b8cfe6214e705bc04f8c2f9d8a304.tar.gz
busybox-74c992af5c6b8cfe6214e705bc04f8c2f9d8a304.tar.bz2
ntpd: with -q, exit after 60 seconds even if time is not synced.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/ntpd.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/networking/ntpd.c b/networking/ntpd.c
index fb3ef2e..6707e9b 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1920,9 +1920,28 @@ static NOINLINE void ntp_init(char **argv)
if (opts & OPT_N)
setpriority(PRIO_PROCESS, 0, -15);
- bb_signals((1 << SIGTERM) | (1 << SIGINT), record_signo);
- /* Removed SIGHUP here: */
- bb_signals((1 << SIGPIPE) | (1 << SIGCHLD), SIG_IGN);
+ /* If network is up, syncronization occurs in ~10 seconds.
+ * We give "ntpd -q" a full minute to finish, then we exit.
+ *
+ * I tested ntpd 4.2.6p1 and apparently it never exits
+ * (will try forever), but it does not feel right.
+ * The goal of -q is to act like ntpdate: set time
+ * after a reasonably small period of polling, or fail.
+ */
+ if (opts & OPT_q)
+ alarm(60);
+
+ bb_signals(0
+ | (1 << SIGTERM)
+ | (1 << SIGINT)
+ | (1 << SIGALRM)
+ , record_signo
+ );
+ bb_signals(0
+ | (1 << SIGPIPE)
+ | (1 << SIGCHLD)
+ , SIG_IGN
+ );
}
int ntpd_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;