Change in vdsm[master]: ifcfg: preserve 'NM_CONTROLLED=no' on removal

wudxw at linux.vnet.ibm.com wudxw at linux.vnet.ibm.com
Wed May 29 06:33:10 UTC 2013


Mark Wu has uploaded a new change for review.

Change subject: ifcfg: preserve 'NM_CONTROLLED=no' on removal
......................................................................

ifcfg: preserve 'NM_CONTROLLED=no' on removal

Since the ifcfg based network configuration conflicts with
NetworkManager, we still need preserve configuration
'NM_CONTROLLED=no' on removing nic.

Change-Id: Iece96e419b1abc4d320aee33e57b471aab96f2de
Signed-off-by: Mark Wu <wudxw at linux.vnet.ibm.com>
---
M vdsm/netconf/ifcfg.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/15148/1

diff --git a/vdsm/netconf/ifcfg.py b/vdsm/netconf/ifcfg.py
index df172fb..09da70f 100644
--- a/vdsm/netconf/ifcfg.py
+++ b/vdsm/netconf/ifcfg.py
@@ -634,7 +634,8 @@
             hwlines = [line for line in open(cf).readlines()
                        if line.startswith('HWADDR=')]
             l = ['DEVICE=%s\n' % nic, 'ONBOOT=yes\n',
-                 'MTU=%s\n' % netinfo.DEFAULT_MTU] + hwlines
+                 'MTU=%s\n' % netinfo.DEFAULT_MTU,
+                 'NM_CONTROLLED=no\n'] + hwlines
             open(cf, 'w').writelines(l)
         except IOError:
             pass


--
To view, visit http://gerrit.ovirt.org/15148
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iece96e419b1abc4d320aee33e57b471aab96f2de
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw at linux.vnet.ibm.com>


More information about the vdsm-patches mailing list