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

confd: minor refactor, /run/container/env -> /run/container/args

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-02-25 19:49:27 +01:00
parent 256c462c0c
commit 414703e851
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/execd/tmpfiles.conf
+1 -1
View File
@@ -1,4 +1,4 @@
d /run/containers/env 0700 - -
d /run/containers/args 0700 - -
d /var/lib/containers/done 0700 - -
d /run/containers/inbox 0700 - -
d /run/containers/queue 0700 - -
src/confd/src/infix-containers.c
+14 -8
View File
@@ -32,12 +32,12 @@ static int add(const char *name, struct lyd_node *cif)
const char *image = lydx_get_cattr(cif, "image");
const char *restart_policy, *string;
struct lyd_node *node;
FILE *fp, *ep = NULL;
FILE *fp, *ap;
char *restart = ""; /* Default restart:10 */
fp = fopenf("w", "%s/%s.sh", INBOX_QUEUE, name);
if (!fp) {
ERROR("Failed adding job %s.sh to job queue" INBOX_QUEUE, name);
ERRNO("Failed adding job %s.sh to job queue" INBOX_QUEUE, name);
return SR_ERR_SYS;
}
@@ -62,14 +62,20 @@ static int add(const char *name, struct lyd_node *cif)
if (lydx_is_enabled(cif, "read-only"))
fprintf(fp, " --read-only");
ap = NULL;
LYX_LIST_FOR_EACH(lyd_child(cif), node, "env") {
if (!ep)
ep = fopenf("w", "/run/containers/env/%s.env", name);
fprintf(ep, "%s=%s\n", lydx_get_cattr(node, "key"), lydx_get_cattr(node, "value"));
if (!ap) {
ap = fopenf("w", "/run/containers/args/%s.env", name);
if (!ap) {
ERRNO("Failed creating env list for container %s", name);
break;
}
}
fprintf(ap, "%s=%s\n", lydx_get_cattr(node, "key"), lydx_get_cattr(node, "value"));
}
if (ep) {
fclose(ep);
fprintf(fp, " -e /run/containers/env/%s.env", name);
if (ap) {
fclose(ap);
fprintf(fp, " -e /run/containers/args/%s.env", name);
}
LYX_LIST_FOR_EACH(lyd_child(cif), node, "network") {