git://git.onelab.eu
/
pyplnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag pyplnet-4.3-20
[pyplnet.git]
/
plnet.py
diff --git
a/plnet.py
b/plnet.py
index
41a64bb
..
1af8db2
100755
(executable)
--- a/
plnet.py
+++ b/
plnet.py
@@
-476,8
+476,9
@@
def prepDetails(interface, hostname=''):
details = {}
details['ONBOOT'] = 'yes'
details['USERCTL'] = 'no'
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
# 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']:
if interface['mac']:
details['HWADDR'] = interface['mac']
if interface['is_primary']: