Make LXC_CLONE_KEEPNAME work

- Passing the LXC_CLONE_KEEPNAME flag to do_lxcapi_clone() was not respected and let to unexpected behaviour for e.g. lxc-clone. We wrap clear_unexp_config_line() and set_config_item_line() in an appropriate if-condition. Signed-off-by: Christian Brauner <christianvanbrauner@gmail.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Make LXC_CLONE_KEEPNAME work
8e8d33d0 · Christian Brauner · Stéphane Graber · 8f52e47b · 8e8d33d0
Commit 8e8d33d0 authored Aug 14, 2015 by Christian Brauner Committed by Stéphane Graber Aug 28, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

lxccontainer.c src/lxc/lxccontainer.c +5 -3

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2693,9 +2693,11 @@ static struct lxc_container *lxcapi_clone(struct lxc_container *c, const char *n
 		goto out;
 	// update utsname
-	if (!set_config_item_locked(c2, "lxc.utsname", newname)) {
+	if (!(flags & LXC_CLONE_KEEPNAME)) {
-		ERROR("Error setting new hostname");
+		if (!set_config_item_locked(c2, "lxc.utsname", newname)) {
-		goto out;
+			ERROR("Error setting new hostname");
+			goto out;
+		}
 	}
 	// copy hooks