Merge pull request #372 from candlerb/candlerb/371

Use `lxc exec --mode=noninteractive` which is more widely compatible
mitogen-hq · Sep 19, 2018 · 67af073 · 67af073
2 parents 49399df + d1c8455
commit 67af073
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mitogen/lxd.py b/mitogen/lxd.py
@@ -63,7 +63,7 @@ def get_boot_command(self):
         bits = [
             self.lxc_path,
             'exec',
-            '--force-noninteractive',
+            '--mode=noninteractive',
             self.container,
             '--',
         ]

diff --git a/tests/lxd_test.py b/tests/lxd_test.py
@@ -18,7 +18,7 @@ def test_okay(self):
         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')