From d1c84552ecf306cc6901f967104cbcd22985a107 Mon Sep 17 00:00:00 2001 From: Brian Candler Date: Mon, 17 Sep 2018 21:45:40 +0100 Subject: [PATCH] Use `lxc exec --mode=noninteractive` which is more widely compatible Closes #371 --- mitogen/lxd.py | 2 +- tests/lxd_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mitogen/lxd.py b/mitogen/lxd.py index 6e8e8b18..9e6702f4 100644 --- a/mitogen/lxd.py +++ b/mitogen/lxd.py @@ -63,7 +63,7 @@ class Stream(mitogen.parent.Stream): bits = [ self.lxc_path, 'exec', - '--force-noninteractive', + '--mode=noninteractive', self.container, '--', ] diff --git a/tests/lxd_test.py b/tests/lxd_test.py index c5e4c485..9c2397a2 100644 --- a/tests/lxd_test.py +++ b/tests/lxd_test.py @@ -18,7 +18,7 @@ class FakeLxcTest(testlib.RouterMixin, unittest2.TestCase): argv = eval(context.call(os.getenv, 'ORIGINAL_ARGV')) self.assertEquals(argv[0], lxc_path) self.assertEquals(argv[1], 'exec') - self.assertEquals(argv[2], '--force-noninteractive') + self.assertEquals(argv[2], '--mode=noninteractive') self.assertEquals(argv[3], 'container_name')