diff options
| author | Lamont Granquist <lamont@chef.io> | 2020-03-02 10:20:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:20:00 -0800 |
| commit | 23d2fdd057177689879a9a3bc280e0d642f8be39 (patch) | |
| tree | bd51463fe76190a076979f50549fa5bbe27f517c | |
| parent | a718989b9e0fefdaca9fdb8d46030e06da51c71f (diff) | |
| parent | 96f639b58e119a587a4c053696711eb7a5340bdf (diff) | |
| download | chef-23d2fdd057177689879a9a3bc280e0d642f8be39.tar.gz | |
Merge pull request #9405 from MsysTechnologiesllc/dh/bacport-pr-8756
[Backport]ifconfig: fix regex matching interface name with hyphen
| -rw-r--r-- | kitchen-tests/kitchen.yml | 2 | ||||
| -rw-r--r-- | lib/chef/provider/ifconfig.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index abb85ff783..561f3d71eb 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -3,7 +3,7 @@ driver: name: dokken privileged: true chef_image: chef/chef - chef_version: current + chef_version: 14 transport: name: dokken diff --git a/lib/chef/provider/ifconfig.rb b/lib/chef/provider/ifconfig.rb index 607f1fa47b..1575127c25 100644 --- a/lib/chef/provider/ifconfig.rb +++ b/lib/chef/provider/ifconfig.rb @@ -112,7 +112,7 @@ class Chef # Permalink for addr_regex : https://rubular.com/r/JrykUpfjRnYeQD @status = shell_out("ifconfig") @status.stdout.each_line do |line| - addr_regex = /^(\w+)(-?):?(\d*):?\ .+$/ + addr_regex = /^((\w|-)+):?(\d*):?\ .+$/ if line =~ addr_regex if line.match(addr_regex).nil? @int_name = "nil" |