mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 03:19:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4039 from tych0/config-no-container-dir

Browse Source 
api: ->save_config() doesn't need to create container dir
This commit is contained in:
Christian Brauner
2021-11-29 17:26:06 +01:00
committed by GitHub
parent 6a9cbecdaa 2fde07c399
commit 030e1aaad5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/lxccontainer.c
View File

@@ -2608,12 +2608,6 @@ static bool do_lxcapi_save_config(struct lxc_container *c, const char *alt_file)
int fd, lret; int fd, lret;
bool ret = false, need_disklock = false; 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 we haven't yet loaded a config, load the stock config. */
if (!c->lxc_conf) { if (!c->lxc_conf) {
if (!do_lxcapi_load_config(c, lxc_global_config_value("lxc.default_config"))) { 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; return false;
/* If we're writing to the container's config file, take the disk lock. /* If we're writing to the container's config file, take the disk lock.