peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-02 13:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/confd: fix review issue 'cannot disable dhcp client'

Browse Source 
- Flip 'enabled' logic, if attribute is missing => 'enabled: false'
 - Release lease on udhcpc exit
 - Call initctl with -f (force) when deleting dhcp-$iface.conf otherwise
   in interactive mode, waiting for (y/N)? question
 - Also, always use -batch and -quiet modes with initctl

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-05-26 15:10:26 +02:00
committed by Tobias Waldekranz
parent 6c8d5472d5
commit 838a83e5b3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/infix-dhcp.c
+7 -6
View File
@@ -22,10 +22,10 @@ static int is_enabled(struct lyd_node *parent, const char *name)
const char *attr;
attr = lydx_get_cattr(parent, name);
if (!attr || !strcmp(attr, "true"))
return 1;
if (!attr || strcmp(attr, "true"))
return 0;
return 0;
return 1;
}
static void add(const char *ifname, const char *client_id)
@@ -45,16 +45,17 @@ static void add(const char *ifname, const char *client_id)
if (args)
sprintf(args, "-C -x 61:'\"%s\"'", client_id);
}
fprintf(fp, "service name:dhcp :%s udhcpc -f -S -i %s %s -- DHCP client @%s\n",
fprintf(fp, "service name:dhcp :%s udhcpc -f -S -R -i %s %s -- DHCP client @%s\n",
ifname, ifname, args ?: "", ifname);
fclose(fp);
systemf("initctl enable dhcp-%s", ifname);
if (systemf("initctl -bfq enable dhcp-%s", ifname))
ERROR("failed enabling DHCP client on %s", ifname);
}
static void del(const char *ifname)
{
systemf("initctl delete dhcp-%s", ifname);
systemf("initctl -bfq delete dhcp-%s", ifname);
}
static int client_change(sr_session_ctx_t *session, uint32_t sub_id, const char *module,