proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 01:52:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

confile: add clearer for lxc.include

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-05-31 18:36:03 +02:00
parent 715ccc969c
commit fdf3c5896e
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lxc/confile.c
View File

@ -195,6 +195,7 @@ static int get_config_seccomp(const char *, char *, int, struct lxc_conf *);
static int clr_config_seccomp(const char *, struct lxc_conf *); static int clr_config_seccomp(const char *, struct lxc_conf *);
static int set_config_includefile(const char *, const char *, struct lxc_conf *); static int set_config_includefile(const char *, const char *, struct lxc_conf *);
static int clr_config_includefile(const char *, struct lxc_conf *);
static int set_config_autodev(const char *, const char *, struct lxc_conf *); static int set_config_autodev(const char *, const char *, struct lxc_conf *);
static int get_config_autodev(const char *, char *, int, struct lxc_conf *); static int get_config_autodev(const char *, char *, int, struct lxc_conf *);
@ -310,7 +311,7 @@ static struct lxc_config_t config[] = {
{ "lxc.console.logfile", set_config_console_logfile, get_config_console_logfile, clr_config_console_logfile, }, { "lxc.console.logfile", set_config_console_logfile, get_config_console_logfile, clr_config_console_logfile, },
{ "lxc.console", set_config_console, get_config_console, clr_config_console, }, { "lxc.console", set_config_console, get_config_console, clr_config_console, },
{ "lxc.seccomp", set_config_seccomp, get_config_seccomp, clr_config_seccomp, }, { "lxc.seccomp", set_config_seccomp, get_config_seccomp, clr_config_seccomp, },
{ "lxc.include", set_config_includefile, NULL, NULL }, { "lxc.include", set_config_includefile, NULL, clr_config_includefile, },
{ "lxc.autodev", set_config_autodev, get_config_autodev, clr_config_autodev, }, { "lxc.autodev", set_config_autodev, get_config_autodev, clr_config_autodev, },
{ "lxc.haltsignal", set_config_haltsignal, get_config_haltsignal, clr_config_haltsignal, }, { "lxc.haltsignal", set_config_haltsignal, get_config_haltsignal, clr_config_haltsignal, },
{ "lxc.rebootsignal", set_config_rebootsignal, get_config_rebootsignal, clr_config_rebootsignal, }, { "lxc.rebootsignal", set_config_rebootsignal, get_config_rebootsignal, clr_config_rebootsignal, },
@ -2772,16 +2773,7 @@ static inline int lxc_get_conf_int(struct lxc_conf *c, char *retv, int inlen,
int lxc_clear_config_item(struct lxc_conf *c, const char *key) int lxc_clear_config_item(struct lxc_conf *c, const char *key)
{ {
int ret = 0; return 0;
if (strcmp(key, "lxc.include") == 0) {
lxc_clear_includes(c);
} else {
ret = -1;
}
return ret;
} }
/* Write out a configuration file. */ /* Write out a configuration file. */
@ -4248,3 +4240,9 @@ static inline int clr_config_limit(const char *key, struct lxc_conf *c)
{ {
return lxc_clear_limits(c, key); return lxc_clear_limits(c, key);
} }
static inline int clr_config_includes(const char *key, struct lxc_conf *c)
{
lxc_clear_includes(c);
return 0;
}