From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Sun, 3 Apr 2016 01:43:35 +0000 (-0500)
Subject: rootfs.bdev_type: implement get and clear
X-Git-Tag: lxc-2.0.0~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F939%2Fhead;p=thirdparty%2Flxc.git

rootfs.bdev_type: implement get and clear

clear is just set(x, ""), but before this patch that didn't work bc
"" is nota valid bdev type.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 64cce02f0..23107a10b 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1859,6 +1859,10 @@ static int config_rootfs_options(const char *key, const char *value,
 static int config_rootfs_bdev_type(const char *key, const char *value,
 			       struct lxc_conf *lxc_conf)
 {
+	if (strlen(value) == 0) {
+		free(lxc_conf->rootfs.bdev_type);
+		lxc_conf->rootfs.bdev_type = NULL;
+	}
 	if (!is_valid_bdev_type(value)) {
 		ERROR("Bad bdev type for %s: %s", key, value);
 		return -1;
@@ -2488,6 +2492,8 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
 		v = c->console.path;
 	else if (strcmp(key, "lxc.rootfs.mount") == 0)
 		v = c->rootfs.mount;
+	else if (strcmp(key, "lxc.rootfs.bdev") == 0)
+		v = c->rootfs.bdev_type;
 	else if (strcmp(key, "lxc.rootfs.options") == 0)
 		v = c->rootfs.options;
 	else if (strcmp(key, "lxc.rootfs") == 0)