Skip to content

L
lxc
Commit 6a21d4ae by Serge Hallyn
Options

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: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent b3b8c97f
Showing with 6 additions and 0 deletions
src/lxc/confile.c
...@@ -1859,6 +1859,10 @@ static int config_rootfs_options(const char *key, const char *value, ...@@ -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, static int config_rootfs_bdev_type(const char *key, const char *value,
struct lxc_conf *lxc_conf) 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)) { if (!is_valid_bdev_type(value)) {
ERROR("Bad bdev type for %s: %s", key, value); ERROR("Bad bdev type for %s: %s", key, value);
return -1; return -1;
...@@ -2488,6 +2492,8 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv, ...@@ -2488,6 +2492,8 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
v = c->console.path; v = c->console.path;
else if (strcmp(key, "lxc.rootfs.mount") == 0) else if (strcmp(key, "lxc.rootfs.mount") == 0)
v = c->rootfs.mount; 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) else if (strcmp(key, "lxc.rootfs.options") == 0)
v = c->rootfs.options; v = c->rootfs.options;
else if (strcmp(key, "lxc.rootfs") == 0) else if (strcmp(key, "lxc.rootfs") == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment