From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 24 Jul 2021 00:28:10 +0000 (+0100)
Subject: uxc: don't restart containers when mount shows up
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=772292e0a37f42e9c6b3fdbe4d9f8e675db5d1d4;p=project%2Fprocd.git

uxc: don't restart containers when mount shows up

procd triggers 'uxc boot' every time a new mount shows up which results
in containers to be restarted which had already been run and may have
ended reguarly, crashed or deliberately stopped.
As the intention of 'uxc boot' is to start containers which were still
waiting for volumes to become ready, really do only that.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/uxc.c b/uxc.c
index d1afc4c..b801d7f 100644
--- a/uxc.c
+++ b/uxc.c
@@ -742,6 +742,7 @@ static void block_cb(struct ubus_request *req, int type, struct blob_attr *msg)
 static int uxc_boot(void)
 {
 	struct blob_attr *cur, *tb[__CONF_MAX];
+	struct runtime_state *s;
 	int rem, ret = 0;
 	char *name;
 	unsigned int id;
@@ -759,6 +760,10 @@ static int uxc_boot(void)
 		if (!tb[CONF_NAME] || !tb[CONF_PATH] || !tb[CONF_AUTOSTART] || !blobmsg_get_bool(tb[CONF_AUTOSTART]))
 			continue;
 
+		s = avl_find_element(&runtime, blobmsg_get_string(tb[CONF_NAME]), s, avl);
+		if (s)
+			continue;
+
 		/* make sure all volumes are ready before starting */
 		if (tb[CONF_VOLUMES])
 			if (checkvolumes(tb[CONF_VOLUMES]))