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

ntpd: do not create pid file if not backgrounded

Browse Source 
function                                             old     new   delta
ntp_init                                             995    1021     +26
ntpd_main                                           1267    1257     -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 26/-10)             Total: 16 bytes

Reported by Alfonso Ranieri <alforan@tin.it>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-03-27 13:37:40 +01:00
parent 4d1c5149a0
commit da996c5d2a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/ntpd.c
View File

@ -2585,6 +2585,10 @@ static NOINLINE void ntp_init(char **argv)
/* -l but no peers: "stratum 1 server" mode */ /* -l but no peers: "stratum 1 server" mode */
G.stratum = 1; G.stratum = 1;
} }
if (!(opts & OPT_n)) /* only if backgrounded: */
write_pidfile_std_path_and_ext("ntpd");
/* If network is up, syncronization occurs in ~10 seconds. /* If network is up, syncronization occurs in ~10 seconds.
* We give "ntpd -q" 10 seconds to get first reply, * We give "ntpd -q" 10 seconds to get first reply,
* then another 50 seconds to finish syncing. * then another 50 seconds to finish syncing.
@ -2641,8 +2645,6 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
*/ */
cnt = G.peer_cnt * (INITIAL_SAMPLES + 1); cnt = G.peer_cnt * (INITIAL_SAMPLES + 1);
write_pidfile_std_path_and_ext("ntpd");
while (!bb_got_signal) { while (!bb_got_signal) {
llist_t *item; llist_t *item;
unsigned i, j; unsigned i, j;