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

#157: Fixed: FetchIpFromDnsmasqLeases returns []

Browse source
This commit is contained in:
Vokhmin Alexey V 2013-10-12 01:16:09 +04:00
parent 23e25c40ab
commit c5a89a54ce
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,7 @@ module Vagrant
def supports_attach_with_namespaces? def supports_attach_with_namespaces?
unless defined?(@supports_attach_with_namespaces) unless defined?(@supports_attach_with_namespaces)
@supports_attach_with_namespaces = run(:attach, '-h', '2>&1').include?('--namespaces') @supports_attach_with_namespaces = run(:attach, '-h', :show_stderr => true).values.join.include?('--namespaces')
end end
return @supports_attach_with_namespaces return @supports_attach_with_namespaces

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

@ -58,7 +58,14 @@ module Vagrant
# Return the output, making sure to replace any Windows-style # Return the output, making sure to replace any Windows-style
# newlines with Unix-style. # newlines with Unix-style.
r.stdout.gsub("\r\n", "\n") if opts[:show_stderr]
{
:stdout => r.stdout.gsub("\r\n", "\n"),
:stderr => r.stderr.gsub("\r\n", "\n")
}
else
r.stdout.gsub("\r\n", "\n")
end
end end
def raw(*command, &block) def raw(*command, &block)