aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-02-12 14:46:12 +0100
committerLukas Nykryn <lnykryn@redhat.com>2014-02-13 14:37:01 +0100
commit032eeb4dd68bbacd78c677de37cc8a1642ec67ab (patch)
treeff5b47b0c75671732bf3224ff53721a7b67cde56
parent8e8c8d062d5dbf29235def1caecf30a26d4859c1 (diff)
downloadinitscripts-032eeb4dd68bbacd78c677de37cc8a1642ec67ab.tar
initscripts-032eeb4dd68bbacd78c677de37cc8a1642ec67ab.tar.gz
initscripts-032eeb4dd68bbacd78c677de37cc8a1642ec67ab.tar.bz2
initscripts-032eeb4dd68bbacd78c677de37cc8a1642ec67ab.tar.xz
initscripts-032eeb4dd68bbacd78c677de37cc8a1642ec67ab.zip
update ifup/ifdown NetworkManager interaction (#1036701, #1061810)
-rw-r--r--initscripts.spec2
-rwxr-xr-xsysconfig/network-scripts/ifdown2
-rw-r--r--sysconfig/network-scripts/network-functions5
3 files changed, 5 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 017cf72b..2599839a 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -28,7 +28,7 @@ Requires: udev >= 125-1
Requires: cpio
Requires: hostname
Conflicts: ipsec-tools < 0.8.0-2
-Conflicts: NetworkManager < 0.9.9.0-9.git20130807
+Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7
Requires(pre): /usr/sbin/groupadd
Requires(post): /sbin/chkconfig, coreutils
Requires(preun): /sbin/chkconfig
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
}