From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 31 May 2017 05:36:10 +0000 (+0200)
Subject: confile: add getter for lxc.rootfs.mount
X-Git-Tag: lxc-2.1.0~110^2~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3af603597e3c43d8f175cd29056eeef06394ccec;p=thirdparty%2Flxc.git

confile: add getter for lxc.rootfs.mount

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 2fbe24fcd..099a86b73 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -112,6 +112,8 @@ static int set_config_rootfs(const char *, const char *, struct lxc_conf *);
 static int get_config_rootfs(struct lxc_container *, const char *, char *, int);
 
 static int set_config_rootfs_mount(const char *, const char *, struct lxc_conf *);
+static int get_config_rootfs_mount(struct lxc_container *, const char *, char *, int);
+
 static int set_config_rootfs_options(const char *, const char *, struct lxc_conf *);
 static int set_config_rootfs_backend(const char *, const char *, struct lxc_conf *);
 static int set_config_pivotdir(const char *, const char *, struct lxc_conf *);
@@ -172,7 +174,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.mount.entry",          set_config_mount,                get_config_mount,             NULL},
 	{ "lxc.mount.auto",           set_config_mount_auto,           get_config_mount_auto,        NULL},
 	{ "lxc.mount",                set_config_fstab,	               get_config_fstab,             NULL},
-	{ "lxc.rootfs.mount",         set_config_rootfs_mount,          NULL, NULL},
+	{ "lxc.rootfs.mount",         set_config_rootfs_mount,         get_config_rootfs_mount,      NULL},
 	{ "lxc.rootfs.options",       set_config_rootfs_options,        NULL, NULL},
 	{ "lxc.rootfs.backend",       set_config_rootfs_backend,        NULL, NULL},
 	{ "lxc.rootfs",               set_config_rootfs,               get_config_rootfs,            NULL},
@@ -2904,8 +2906,6 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
 		v = c->console.log_path;
 	else if (strcmp(key, "lxc.console") == 0)
 		v = c->console.path;
-	else if (strcmp(key, "lxc.rootfs.mount") == 0)
-		v = c->rootfs.mount;
 	else if (strcmp(key, "lxc.rootfs.backend") == 0)
 		v = c->rootfs.bdev_type;
 	else if (strcmp(key, "lxc.rootfs.options") == 0)
@@ -3834,3 +3834,9 @@ static int get_config_rootfs(struct lxc_container *c, const char *key,
 {
 	return lxc_get_conf_str(retv, inlen, c->lxc_conf->rootfs.path);
 }
+
+static int get_config_rootfs_mount(struct lxc_container *c, const char *key,
+				   char *retv, int inlen)
+{
+	return lxc_get_conf_str(retv, inlen, c->lxc_conf->rootfs.mount);
+}