proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 19:35:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch use of #define with static char*

Browse Source 
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2012-11-13 17:54:01 -06:00
parent c95cf86f39
commit ae9242c86a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/conf.c
View File

@ -1732,6 +1732,8 @@ static int setup_private_host_hw_addr(char *veth1)
return 0; return 0;
} }
static char *default_rootfs_mount = LXCROOTFSMOUNT;
struct lxc_conf *lxc_conf_init(void) struct lxc_conf *lxc_conf_init(void)
{ {
struct lxc_conf *new; struct lxc_conf *new;
@ -1750,7 +1752,7 @@ struct lxc_conf *lxc_conf_init(void)
new->console.master = -1; new->console.master = -1;
new->console.slave = -1; new->console.slave = -1;
new->console.name[0] = '\0'; new->console.name[0] = '\0';
new->rootfs.mount = LXCROOTFSMOUNT; new->rootfs.mount = default_rootfs_mount;
lxc_list_init(&new->cgroup); lxc_list_init(&new->cgroup);
lxc_list_init(&new->network); lxc_list_init(&new->network);
lxc_list_init(&new->mount_list); lxc_list_init(&new->mount_list);
@ -2576,7 +2578,7 @@ void lxc_conf_free(struct lxc_conf *conf)
return; return;
if (conf->console.path) if (conf->console.path)
free(conf->console.path); free(conf->console.path);
if (conf->rootfs.mount != LXCROOTFSMOUNT) if (conf->rootfs.mount != default_rootfs_mount)
free(conf->rootfs.mount); free(conf->rootfs.mount);
lxc_clear_config_network(conf); lxc_clear_config_network(conf);
#if HAVE_APPARMOR #if HAVE_APPARMOR