emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ntpd: with -q, exit after 60 seconds even if time is not synced.

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-08-27 02:15:01 +02:00
parent 1cd0d86005
commit 74c992af5c
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
networking/ntpd.c
View File

@ -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;