[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH rhel6-branch] Don't deactivate active device before running nm-c-e (#608773)



Due to ifcfg file being removed before writing updated one,
the connection is deactivated unconditionally, which is bad.
It happened with devices activated in stage 1.
---
 simpleconfig.py |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/simpleconfig.py b/simpleconfig.py
index 23fcaaa..a51ce6c 100644
--- a/simpleconfig.py
+++ b/simpleconfig.py
@@ -125,8 +125,7 @@ class IfcfgFile(SimpleConfigFile):
         return len(self.info)
 
     # This method has to write file in a particular
-    # way so that ifcfg-rh's inotify mechanism triggeres
-    # TODORV: check that it is still true.
+    # way so that ifcfg-rh's inotify mechanism is triggered.
     def write(self, dir=None):
         """Writes values into ifcfg file."""
 
@@ -140,10 +139,5 @@ class IfcfgFile(SimpleConfigFile):
         os.close(fd)
 
         os.chmod(newifcfg, 0644)
-        try:
-            os.remove(path)
-        except OSError, e:
-            if e.errno != 2:
-                raise
         shutil.move(newifcfg, path)
 
-- 
1.6.0.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]