#157: Fixed: FetchIpFromDnsmasqLeases returns []
This commit is contained in:
parent
23e25c40ab
commit
c5a89a54ce
2 changed files with 9 additions and 2 deletions
|
@ -119,7 +119,7 @@ module Vagrant
|
|||
|
||||
def 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
|
||||
|
||||
return @supports_attach_with_namespaces
|
||||
|
|
|
@ -58,7 +58,14 @@ module Vagrant
|
|||
|
||||
# Return the output, making sure to replace any Windows-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
|
||||
|
||||
def raw(*command, &block)
|
||||
|
|
Loading…
Reference in a new issue