From 414703e8511ebd3daa2e63aff79ca17daf23e545 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Wed, 24 Jan 2024 11:12:30 +0100
Subject: [PATCH] confd: minor refactor, /run/container/env ->
 /run/container/args

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/execd/tmpfiles.conf      |  2 +-
 src/confd/src/infix-containers.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/package/execd/tmpfiles.conf b/package/execd/tmpfiles.conf
index 3248e864..1cf96006 100644
--- a/package/execd/tmpfiles.conf
+++ b/package/execd/tmpfiles.conf
@@ -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 - -
diff --git a/src/confd/src/infix-containers.c b/src/confd/src/infix-containers.c
index ef93dd40..74172e16 100644
--- a/src/confd/src/infix-containers.c
+++ b/src/confd/src/infix-containers.c
@@ -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") {