driver/cli: Deal with namespaces args for lxc-attach when the sudo wrapper script is in place [GH-300]
This commit is contained in:
parent
752fa9b4e5
commit
d3b9d53097
2 changed files with 7 additions and 0 deletions
|
@ -97,6 +97,11 @@ module Vagrant
|
|||
opts = cmd.pop
|
||||
namespaces = Array(opts[:namespaces]).map(&:upcase).join('|')
|
||||
|
||||
# HACK: The wrapper script should be able to handle this
|
||||
if @sudo_wrapper.wrapper_path
|
||||
namespaces = "'#{namespaces}'"
|
||||
end
|
||||
|
||||
if namespaces
|
||||
if supports_attach_with_namespaces?
|
||||
extra = ['--namespaces', namespaces]
|
||||
|
|
|
@ -4,6 +4,8 @@ module Vagrant
|
|||
# Include this so we can use `Subprocess` more easily.
|
||||
include Vagrant::Util::Retryable
|
||||
|
||||
attr_reader :wrapper_path
|
||||
|
||||
def initialize(wrapper_path = nil)
|
||||
@wrapper_path = wrapper_path
|
||||
@logger = Log4r::Logger.new("vagrant::lxc::sudo_wrapper")
|
||||
|
|
Loading…
Reference in a new issue