From d4d78dbe5ebe02d30e0cdf6f9ae85af4407b357d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 22 Nov 2020 04:23:29 +0000 Subject: [PATCH] uxc: also delete procd runtime state on 'delete' Signed-off-by: Daniel Golle --- uxc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/uxc.c b/uxc.c index 5809b6d..eb40eb2 100644 --- a/uxc.c +++ b/uxc.c @@ -640,6 +640,8 @@ static int uxc_delete(char *name, bool force) { struct blob_attr *cur, *tb[__CONF_MAX]; struct runtime_state *s = NULL; + static struct blob_buf req; + uint32_t id; int rem, ret = 0; bool found = false; char *fname; @@ -678,6 +680,22 @@ static int uxc_delete(char *name, bool force) } } + if (s) { + ret = ubus_lookup_id(ctx, "container", &id); + if (ret) + goto errout; + + blob_buf_init(&req, 0); + blobmsg_add_string(&req, "name", s->container_name); + blobmsg_add_string(&req, "instance", s->instance_name); + + if (ubus_invoke(ctx, id, "delete", req.head, NULL, NULL, 3000)) { + blob_buf_free(&req); + ret=EIO; + goto errout; + } + } + if (stat(fname, &sb) == -1) { ret=ENOENT; goto errout; -- 2.30.2