Skip to content

Commit bb07f87

Browse files
committed
confd: simplify dnsmasq management during DHCP server reconf
Signed-off-by: Joachim Wiberg <[email protected]>
1 parent 4075542 commit bb07f87

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/confd/src/infix-dhcp-server.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ static void del(const char *subnet, struct lyd_node *cfg)
240240
int prefix_len;
241241
char line[512];
242242

243-
systemf("initctl -nbq stop dnsmasq");
244243
fremove(DNSMASQ_SUBNET_FMT, subnet_tag(subnet));
245244

246245
/* Parse subnet/prefix */
@@ -369,7 +368,6 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
369368
if (err)
370369
goto err_done;
371370
} else {
372-
system("initctl -nbq stop dnsmasq"), deleted++;
373371
erase(DNSMASQ_LEASES);
374372
erase(DNSMASQ_GLOBAL_OPTS);
375373

@@ -382,9 +380,7 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
382380
}
383381

384382
err_done:
385-
if (deleted)
386-
system("initctl -nbq restart dnsmasq");
387-
else
383+
if (added || deleted)
388384
system("initctl -nbq touch dnsmasq");
389385

390386
lyd_free_tree(diff);

0 commit comments

Comments
 (0)