On 10/01/2018 04:18 AM, Julio Faracco wrote:
This patch introduce the new settings for LXC 3.0 and higher. The
older
versions keep the compatibility to deprecated settings for LXC, but
after release 3.0, the compatibility was removed. This commit adds the
support to the refactored settings.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/lxc/lxc_native.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index cbdec723dd..c0f70ebb7d 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -200,7 +200,9 @@ lxcSetRootfs(virDomainDefPtr def,
int type = VIR_DOMAIN_FS_TYPE_MOUNT;
VIR_AUTOFREE(char *) value = NULL;
- if (virConfGetValueString(properties, "lxc.rootfs", &value) <= 0)
+ if (virConfGetValueString(properties, "lxc.rootfs", &value) <= 0
&&
+ /* Legacy config keys were removed after release 3.0. */
+ virConfGetValueString(properties, "lxc.rootfs.path", &value) <=
0)
The intention looks good to me, but the formatting doesn't. Either:
/* comment */
if (func() <= 0 &&
func() <= 0)
return -1;
or:
if (func() <= 0) {
/* comment */
if (func() <= 0)
return -1;
}
Michal