From 2f00d21f7d0bf74de4d06d26a4475b91da90a4f7 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 27 Feb 2014 11:44:46 +0100
Subject: network: try to not compete with NM during boot

---
 sysconfig/network-scripts/ifup | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sysconfig/network-scripts/ifup')

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
-- 
cgit v1.2.1