Merge pull request #372 from candlerb/candlerb/371

Use `lxc exec --mode=noninteractive` which is more widely compatible
pull/381/head
dw 6 years ago committed by GitHub
commit 67af073f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -63,7 +63,7 @@ class Stream(mitogen.parent.Stream):
bits = [ bits = [
self.lxc_path, self.lxc_path,
'exec', 'exec',
'--force-noninteractive', '--mode=noninteractive',
self.container, self.container,
'--', '--',
] ]

@ -18,7 +18,7 @@ class FakeLxcTest(testlib.RouterMixin, unittest2.TestCase):
argv = eval(context.call(os.getenv, 'ORIGINAL_ARGV')) argv = eval(context.call(os.getenv, 'ORIGINAL_ARGV'))
self.assertEquals(argv[0], lxc_path) self.assertEquals(argv[0], lxc_path)
self.assertEquals(argv[1], 'exec') self.assertEquals(argv[1], 'exec')
self.assertEquals(argv[2], '--force-noninteractive') self.assertEquals(argv[2], '--mode=noninteractive')
self.assertEquals(argv[3], 'container_name') self.assertEquals(argv[3], 'container_name')

Loading…
Cancel
Save