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

confd: simplify, drop augeas for direct hostname update

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-06-03 23:05:04 +02:00
committed by Tobias Waldekranz
parent 189ecd8fb0
commit 96cdc7c628
1 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/ietf-system.c
+45 -42
View File
@@ -24,7 +24,10 @@
#define XPATH_AUTH_ XPATH_BASE_"/authentication"
#define CLOCK_PATH_ "/ietf-system:system-state/clock"
#define PLATFORM_PATH_ "/ietf-system:system-state/platform"
#define _PATH_PASSWD "/etc/passwd"
#define _PATH_HOSTNAME "/etc/hostname"
#define _PATH_HOSTS "/etc/hosts"
struct sr_change {
sr_change_oper_t op;
@@ -1375,11 +1378,10 @@ static int change_editor(sr_session_ctx_t *session, uint32_t sub_id, const char
static int change_hostname(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
const char *xpath, sr_event_t event, unsigned request_id, void *priv)
{
struct confd *confd = (struct confd *)priv;
const char *host, *tmp = NULL;
char **hosts, *current;
int err, i, nhosts;
char *nm;
const char *hostip = "127.0.1.1";
char *nm, buf[256];
FILE *nfp, *fp;
int err, fd;
if (event != SR_EV_DONE)
return SR_ERR_OK;
@@ -1395,41 +1397,51 @@ static int change_hostname(sr_session_ctx_t *session, uint32_t sub_id, const cha
}
}
if (aug_get(confd->aug, "etc/hostname/hostname", &tmp) <= 0) {
err = SR_ERR_INTERNAL;
goto err;
}
current = strdup(tmp);
if (!current) {
err = SR_ERR_NO_MEMORY;
goto err;
}
err = sethostname(nm, strlen(nm));
err = err ? : aug_set(confd->aug, "etc/hostname/hostname", nm);
nhosts = aug_match(confd->aug, "etc/hosts/*/canonical", &hosts);
for (i = 0; i < nhosts; i++) {
if (aug_get(confd->aug, hosts[i], &host) <= 0)
continue;
if (!strcmp(host, current))
err = err ? : aug_set(confd->aug, hosts[i], nm);
free(hosts[i]);
}
if (nhosts)
free(hosts);
free(current);
if (err) {
ERROR("failed setting hostname");
err = SR_ERR_SYS;
goto err;
}
fp = fopen(_PATH_HOSTNAME, "w");
if (!fp) {
err = SR_ERR_INTERNAL;
goto err;
}
fprintf(fp, "%s\n", nm);
fclose(fp);
nfp = fopen(_PATH_HOSTS "+", "w");
if (!nfp) {
err = SR_ERR_INTERNAL;
goto err;
}
fd = fileno(nfp);
if (fd == -1 || fchown(fd, 0, 0) || fchmod(fd, 0644)) {
fclose(nfp);
goto err;
}
fp = fopen(_PATH_HOSTS, "r");
if (!fp) {
err = SR_ERR_INTERNAL;
fclose(nfp);
goto err;
}
while (fgets(buf, sizeof(buf), fp)) {
if (!strncmp(buf, hostip, strlen(hostip)))
snprintf(buf, sizeof(buf), "%s\t%s\n", hostip, nm);
fputs(buf, nfp);
}
fclose(fp);
fclose(nfp);
if (rename(_PATH_HOSTS "+", _PATH_HOSTS))
ERRNO("Failed activating changes to "_PATH_HOSTS);
/* skip in bootstrap, lldpd and avahi have not started yet */
if (systemf("runlevel >/dev/null 2>&1"))
goto err;
@@ -1447,7 +1459,6 @@ err:
return err;
}
err = err ? : aug_save(confd->aug);
if (sys_reload_services())
return SR_ERR_SYS;
@@ -1460,14 +1471,6 @@ int ietf_system_init(struct confd *confd)
os_init();
/* TODO: Every file and lens seems to be already loaded at aug_init() */
if (aug_load_file(confd->aug, "/etc/hostname") ||
aug_load_file(confd->aug, "/etc/hosts")) {
ERROR("ietf-system: Augeas initialization failed");
rc = SR_ERR_INTERNAL;
goto fail;
}
REGISTER_CHANGE(confd->session, "ietf-system", XPATH_AUTH_, 0, change_auth, confd, &confd->sub);
REGISTER_MONITOR(confd->session, "ietf-netconf-acm", "/ietf-netconf-acm:nacm//.",
0, change_nacm, confd, &confd->sub);