[lxc-devel] [lxc/master] switch user facing name to lxc.rootfs.backend

[hallyn on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 353 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160403/aa184112/attachment.bin>
-------------- next part --------------
From 327a1e78e7464bfea19f377aee41aa0fb2803c88 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Sat, 2 Apr 2016 21:32:34 -0500
Subject: [PATCH] switch user facing name to lxc.rootfs.backend

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
---
 src/lxc/confile.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 23107a1..7f34164 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -73,7 +73,7 @@ static int config_fstab(const char *, const char *, struct lxc_conf *);
 static int config_rootfs(const char *, const char *, struct lxc_conf *);
 static int config_rootfs_mount(const char *, const char *, struct lxc_conf *);
 static int config_rootfs_options(const char *, const char *, struct lxc_conf *);
-static int config_rootfs_bdev_type(const char *, const char *, struct lxc_conf *);
+static int config_rootfs_backend(const char *, const char *, struct lxc_conf *);
 static int config_pivotdir(const char *, const char *, struct lxc_conf *);
 static int config_utsname(const char *, const char *, struct lxc_conf *);
 static int config_hook(const char *, const char *, struct lxc_conf *lxc_conf);
@@ -132,7 +132,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.mount",                config_fstab                },
 	{ "lxc.rootfs.mount",         config_rootfs_mount         },
 	{ "lxc.rootfs.options",       config_rootfs_options       },
-	{ "lxc.rootfs.bdev",          config_rootfs_bdev_type     },
+	{ "lxc.rootfs.backend",       config_rootfs_backend       },
 	{ "lxc.rootfs",               config_rootfs               },
 	{ "lxc.pivotdir",             config_pivotdir             },
 	{ "lxc.utsname",              config_utsname              },
@@ -1856,7 +1856,7 @@ static int config_rootfs_options(const char *key, const char *value,
 	return config_string_item(&lxc_conf->rootfs.options, value);
 }
 
-static int config_rootfs_bdev_type(const char *key, const char *value,
+static int config_rootfs_backend(const char *key, const char *value,
 			       struct lxc_conf *lxc_conf)
 {
 	if (strlen(value) == 0) {
@@ -1864,7 +1864,7 @@ static int config_rootfs_bdev_type(const char *key, const char *value,
 		lxc_conf->rootfs.bdev_type = NULL;
 	}
 	if (!is_valid_bdev_type(value)) {
-		ERROR("Bad bdev type for %s: %s", key, value);
+		ERROR("Bad rootfs.backend: '%s'", value);
 		return -1;
 	}
 
@@ -2492,7 +2492,7 @@ 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)
+	else if (strcmp(key, "lxc.rootfs.backend") == 0)
 		v = c->rootfs.bdev_type;
 	else if (strcmp(key, "lxc.rootfs.options") == 0)
 		v = c->rootfs.options;