From: parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 12 Dec 2018 09:22:10 +0000 (+0100)
Subject: comment off NM_CONTROLLED=no
X-Git-Tag: pyplnet-4.3-20~1
X-Git-Url: http://git.onelab.eu/?p=pyplnet.git;a=commitdiff_plain;h=347d1c93a7323c835d17c4cbc5b3c9b60bad3a05

comment off NM_CONTROLLED=no
---

diff --git a/plnet.py b/plnet.py
index 41a64bb..1af8db2 100755
--- a/plnet.py
+++ b/plnet.py
@@ -476,8 +476,9 @@ def prepDetails(interface, hostname=''):
     details = {}
     details['ONBOOT']  = 'yes'
     details['USERCTL'] = 'no'
+    # starting with f27, it's OK to use NetworkManager
     # attempt to work around issues seen starting with f23
-    details['NM_CONTROLLED'] = 'no'
+    # details['NM_CONTROLLED'] = 'no'
     if interface['mac']:
         details['HWADDR'] = interface['mac']
     if interface['is_primary']: