glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

driver/cli: Deal with namespaces args for lxc-attach when the sudo wrapper script is in place [GH-300]

Browse source
This commit is contained in:
Fabio Rehm 2014-07-24 21:45:04 -03:00
parent 752fa9b4e5
commit d3b9d53097
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/vagrant-lxc/driver/cli.rb
View file

@ -97,6 +97,11 @@ module Vagrant
opts = cmd.pop opts = cmd.pop
namespaces = Array(opts[:namespaces]).map(&:upcase).join('|') 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 namespaces
if supports_attach_with_namespaces? if supports_attach_with_namespaces?
extra = ['--namespaces', namespaces] extra = ['--namespaces', namespaces]

2
lib/vagrant-lxc/sudo_wrapper.rb
View file

@ -4,6 +4,8 @@ module Vagrant
# Include this so we can use `Subprocess` more easily. # Include this so we can use `Subprocess` more easily.
include Vagrant::Util::Retryable include Vagrant::Util::Retryable
attr_reader :wrapper_path
def initialize(wrapper_path = nil) def initialize(wrapper_path = nil)
@wrapper_path = wrapper_path @wrapper_path = wrapper_path
@logger = Log4r::Logger.new("vagrant::lxc::sudo_wrapper") @logger = Log4r::Logger.new("vagrant::lxc::sudo_wrapper")