Do not write /lib/udev.d rules if instPath is ''

If instPath is empty, it means bringUp() has been called to kick out
new network configuration files for use during installation.  Do not
try to write out udev.d files during installation.

1 files changed, 23 insertions, 22 deletions

diff --git a/network.py b/network.py
index 10cb62dc2..4fc716596 100644
--- a/network.py
+++ b/network.py
@@ -598,38 +598,39 @@ class Network:
         f.close()
 
         # /lib/udev/rules.d/70-persistent-net.rules
-        if not os.path.isdir("%s/lib/udev/rules.d" %(instPath,)):
-            iutil.mkdirChain("%s/lib/udev/rules.d" %(instPath,))
+        if not instPath == '':
+            if not os.path.isdir("%s/lib/udev/rules.d" %(instPath,)):
+                iutil.mkdirChain("%s/lib/udev/rules.d" %(instPath,))
 
-        f = open(instPath + "/lib/udev/rules.d/70-persistent-net.rules", "w")
-        f.write("""
+            f = open(instPath + "/lib/udev/rules.d/70-persistent-net.rules", "w")
+            f.write("""
 # This file was automatically generated by the /lib/udev/write_net_rules
 # program run by the persistent-net-generator.rules rules file.
 #
 # You can modify it, as long as you keep each rule on a single line.
 
 """)
-        for dev in self.netdevices.values():
-            addr = dev.get("HWADDR")
-            if not addr:
-                continue
-            devname = dev.get("DEVICE")
-            basename = devname
-            while basename is not "" and basename[-1] in string.digits:
-                basename = basename[:-1]
+            for dev in self.netdevices.values():
+                addr = dev.get("HWADDR")
+                if not addr:
+                    continue
+                devname = dev.get("DEVICE")
+                basename = devname
+                while basename is not "" and basename[-1] in string.digits:
+                    basename = basename[:-1]
 
-            # rules are case senstive for address. Lame.
-            addr = addr.lower()
+                # rules are case senstive for address. Lame.
+                addr = addr.lower()
 
-            s = "" 
-            if len(dev.get("DESC")) > 0:
-                s = "# %s (rule written by anaconda)\n" % (dev.get("DESC"),)
-            else:
-                s = "# %s (rule written by anaconda)\n" % (devname,)
-            s = s + 'SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", KERNEL=="%s*", NAME="%s"\n' % (addr, basename, devname)
-            f.write(s)
+                s = ""
+                if len(dev.get("DESC")) > 0:
+                    s = "# %s (rule written by anaconda)\n" % (dev.get("DESC"),)
+                else:
+                    s = "# %s (rule written by anaconda)\n" % (devname,)
+                s = s + 'SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", KERNEL=="%s*", NAME="%s"\n' % (addr, basename, devname)
+                f.write(s)
 
-        f.close()
+            f.close()
 
     # write out current configuration state and wait for NetworkManager
     # to bring the device up