From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Mon, 21 Mar 2016 22:50:39 +0000 (-0600)
Subject: c/r: don't pass --ext-mount-map flag when console=none
X-Git-Tag: lxc-2.0.0.rc13~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36d2096cf43340701150778d5547ec4f5a127338;p=thirdparty%2Flxc.git

c/r: don't pass --ext-mount-map flag when console=none

We don't pass anything on the restore side since we didn't save anything,
but the restore side will expect something if we pass this. Instead, let's
not pass anything.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
---

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 7b72c6ec8..1b3c4ac62 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -259,9 +259,10 @@ static void exec_criu(struct criu_opts *opts)
 		DECLARE_ARG("--freeze-cgroup");
 		DECLARE_ARG(log);
 
-		DECLARE_ARG("--ext-mount-map");
-		DECLARE_ARG("/dev/console:console");
 		if (opts->tty_id[0]) {
+			DECLARE_ARG("--ext-mount-map");
+			DECLARE_ARG("/dev/console:console");
+
 			DECLARE_ARG("--external");
 			DECLARE_ARG(opts->tty_id);
 		}