diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-03-10 15:45:33 -0500 |
|---|---|---|
| committer | Petr Lautrbach <plautrba@redhat.com> | 2011-03-21 14:01:50 +0100 |
| commit | 34ad37dfc95c82d9cf5a17f43b8edb5fee8638bd (patch) | |
| tree | 7d837a10e74c1b0c9985de6d0fe61a678f4762bf | |
| parent | 68f7d5703131dd14132473a78e87ef0443a614a7 (diff) | |
| download | initscripts-34ad37dfc95c82d9cf5a17f43b8edb5fee8638bd.tar initscripts-34ad37dfc95c82d9cf5a17f43b8edb5fee8638bd.tar.gz initscripts-34ad37dfc95c82d9cf5a17f43b8edb5fee8638bd.tar.bz2 initscripts-34ad37dfc95c82d9cf5a17f43b8edb5fee8638bd.tar.xz initscripts-34ad37dfc95c82d9cf5a17f43b8edb5fee8638bd.zip | |
Fix check for unmanaged devices so it does the right thing with devices NM doesn't know about at all. (#670154)
It was returning nonexistent devices, or devies NM knew nothing about (bridges), as being managed.
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 9abf1772..341124f1 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -225,7 +225,7 @@ is_nm_active () is_nm_device_unmanaged () { - LANG=C nmcli -t --fields device,state dev status 2>/dev/null | grep -q "^${1}:unmanaged$" + LANG=C nmcli -t --fields GENERAL dev list iface "${1}" 2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }' } # Sets $alias to the device module if $? != 0 |