aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts/ifup
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-02-27 11:44:46 +0100
committerLukas Nykryn <lnykryn@redhat.com>2014-03-11 14:17:17 +0100
commit2f00d21f7d0bf74de4d06d26a4475b91da90a4f7 (patch)
tree2220309d32d25aaee43736bafba3693bd65f26c5 /sysconfig/network-scripts/ifup
parentfc38d5eead7a1477c6fe580b224c7a6e113d52fe (diff)
downloadinitscripts-2f00d21f7d0bf74de4d06d26a4475b91da90a4f7.tar
initscripts-2f00d21f7d0bf74de4d06d26a4475b91da90a4f7.tar.gz
initscripts-2f00d21f7d0bf74de4d06d26a4475b91da90a4f7.tar.bz2
initscripts-2f00d21f7d0bf74de4d06d26a4475b91da90a4f7.tar.xz
initscripts-2f00d21f7d0bf74de4d06d26a4475b91da90a4f7.zip
network: try to not compete with NM during boot
Diffstat (limited to 'sysconfig/network-scripts/ifup')
-rwxr-xr-xsysconfig/network-scripts/ifup1
1 files changed, 1 insertions, 0 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index d16eca68..278fde39 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -69,6 +69,7 @@ if [ "$_use_nm" = "true" -a -n "$UUID" ]; then
if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then
exit 0
fi
+ is_nm_handling ${DEVICE} && exit 0
nmcli con up uuid "$UUID"
exit $?
fi