From: Tycho Andersen <tycho@tycho.pizza>
Date: Mon, 29 Nov 2021 13:23:17 +0000 (-0500)
Subject: api: ->save_config() doesn't need to create container dir
X-Git-Tag: lxc-4.0.12~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93edd510ae9980b3ea9fe6d68bff8df7aa0169a7;p=thirdparty%2Flxc.git

api: ->save_config() doesn't need to create container dir

If we're saving the config file to somewhere that's *not* the container
dir, we don't need to create the container dir. Let's not do this and
thus not require its parent to exist, which can be confusing, especially in
light of the sparse logging through these functions.

Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 96fdb3fd2..b83264f7c 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2608,12 +2608,6 @@ static bool do_lxcapi_save_config(struct lxc_container *c, const char *alt_file)
 	int fd, lret;
 	bool ret = false, need_disklock = false;
 
-	if (!alt_file)
-		alt_file = c->configfile;
-
-	if (!alt_file)
-		return false;
-
 	/* If we haven't yet loaded a config, load the stock config. */
 	if (!c->lxc_conf) {
 		if (!do_lxcapi_load_config(c, lxc_global_config_value("lxc.default_config"))) {
@@ -2625,7 +2619,13 @@ static bool do_lxcapi_save_config(struct lxc_container *c, const char *alt_file)
 		}
 	}
 
-	if (!create_container_dir(c))
+	if (!alt_file) {
+		alt_file = c->configfile;
+		if (!create_container_dir(c))
+			return false;
+	}
+
+	if (!alt_file)
 		return false;
 
 	/* If we're writing to the container's config file, take the disk lock.