Merge pull request #9315 from basvandervlies/ifconfig_obsolete

ifconfig is replaced by ip command suite. So use "ip addr" and failback
This commit is contained in:
Chris Roberts 2018-01-16 20:12:18 -08:00 committed by GitHub
commit 55460379f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions

View File

@ -3,9 +3,17 @@ module VagrantPlugins
module Cap
class ReadIPAddress
def self.read_ip_address(machine)
command = "LANG=en ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1 }'"
comm = machine.communicate
if comm.test("which ip")
command = "LANG=en ip addr | grep -Po 'inet \\K[\\d.]+' | grep -v 127.0.0.1"
else
command = "LANG=en ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1 }'"
end
result = ""
machine.communicate.sudo(command) do |type, data|
comm.sudo(command) do |type, data|
result << data if type == :stdout
end