aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-02-12 14:46:12 +0100
committerLukas Nykryn <lnykryn@redhat.com>2014-02-12 14:52:59 +0100
commitb60bd5950e975feb0901594c51b33e88b482ce56 (patch)
treede99bd608accb2d11b97dfbb3f5ddedd596dc4b2 /sysconfig
parent00d5e84240ed2fd858f1dc5a54185875ac677203 (diff)
downloadinitscripts-b60bd5950e975feb0901594c51b33e88b482ce56.tar
initscripts-b60bd5950e975feb0901594c51b33e88b482ce56.tar.gz
initscripts-b60bd5950e975feb0901594c51b33e88b482ce56.tar.bz2
initscripts-b60bd5950e975feb0901594c51b33e88b482ce56.tar.xz
initscripts-b60bd5950e975feb0901594c51b33e88b482ce56.zip
update ifup/ifdown NetworkManager interaction (#1036701, #1061810)
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown2
-rw-r--r--sysconfig/network-scripts/network-functions5
2 files changed, 4 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 510b5bcf..9686764e 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -43,7 +43,7 @@ fi
if [ "$_use_nm" = "true" ]; then
if [ -n "$UUID" -a -z "$DEVICE" ]; then
- DEVICE=$(nmcli -t --fields uuid,devices con show active | awk -F ':' "\$1 == \"$UUID\" { print \$2 }")
+ DEVICE=$(nmcli -t --fields uuid,devices con show --active | awk -F ':' "\$1 == \"$UUID\" { print \$2 }")
fi
if [ -n "$DEVICE" ] && ! is_nm_device_unmanaged "$DEVICE" ; then
if ! LC_ALL=C nmcli -t -f STATE,DEVICE dev status | egrep -q "^(failed|disconnected|unmanaged|unavailable):$DEVICE$"; then
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index cd4171fe..1e459249 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -170,9 +170,10 @@ source_config ()
else
ISALIAS=no
fi
- ! is_false $NM_CONTROLLED && is_nm_running && _use_nm=true
- if [ -z "$UUID" -a "$_use_nm" = "true" ]; then
+ if ! is_false $NM_CONTROLLED && is_nm_running; then
+ nmcli con load "/etc/sysconfig/network-scripts/$CONFIG"
UUID=$(get_uuid_by_config $CONFIG)
+ [ -n "$UUID" ] && _use_nm=true
fi
}