Skip to content
Snippets Groups Projects
Commit 0d766871 authored by Sameer Agrawal's avatar Sameer Agrawal Committed by Luca Boccassi
Browse files

Fix ifconfig parsing

ifconfig from net-tools does not output "inet.*addr:" pattern anymore.
Match IP addresses instead. But ifconfig from busybox does, so try
and match either patterns.

$ /sbin/ifconfig wlp2s0 | grep 'inet.*addr:'
$ /sbin/ifconfig eth0 | grep -E 'inet.*addr:|inet [0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*'
        inet 192.168.1.91  netmask 255.255.255.0  broadcast 192.168.1.255
$ busybox ifconfig eth0 | grep -E 'inet.*addr:|inet [0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*'
          inet addr:192.168.1.91  Bcast:192.168.1.255  Mask:255.255.255.0
          inet6 addr: fd00::1:60ad:2691:4cc6:f32/64 Scope:Global
          inet6 addr: fe80::96de:80ff:feae:b976/64 Scope:Link
          inet6 addr: fd00::1:96de:80ff:feae:b976/64 Scope:Global
          inet6 addr: 2a00:23c5:be85:1400:96de:80ff:feae:b976/64 Scope:Global
          inet6 addr: 2a00:23c5:be85:1400:60ad:2691:4cc6:f32/64 Scope:Global

Closes: #892772
parent a28b96c5
No related branches found
No related tags found
1 merge request!3Fix ifconfig parsing
......@@ -107,7 +107,7 @@ do_netsetup ()
# if configuration of device worked we should have an assigned
# IP address, if so let's use the device as $DEVICE for later usage.
# simple and primitive approach which seems to work fine
if ifconfig $dev | grep -q 'inet.*addr:'
if ifconfig $dev | grep -q -E 'inet.*addr:|inet [0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*'
then
export DEVICE="$dev"
break
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment