diff options
author | Bill Nottingham <notting@redhat.com> | 2011-02-02 14:07:26 -0500 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2011-02-04 16:53:48 -0500 |
commit | 04890d13a6efe5040dba52fdde525b923387030c (patch) | |
tree | 1bf64d740e5c5868c620727bc0292e0a477d1441 /pyanaconda/network.py | |
parent | fc4387c18f1fdd234d57437e0a1c2748da6cfe15 (diff) | |
download | anaconda-04890d13a6efe5040dba52fdde525b923387030c.tar.gz anaconda-04890d13a6efe5040dba52fdde525b923387030c.tar.xz anaconda-04890d13a6efe5040dba52fdde525b923387030c.zip |
Don't write our own udev persistent net rules; use udev's generator.
Diffstat (limited to 'pyanaconda/network.py')
-rw-r--r-- | pyanaconda/network.py | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/pyanaconda/network.py b/pyanaconda/network.py index b37c074a6..304b1c029 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -756,40 +756,6 @@ class Network: # /etc/resolv.conf is managed by NM - # /etc/udev/rules.d/70-persistent-net.rules - rules = "/etc/udev/rules.d/70-persistent-net.rules" - if not os.path.isfile(rules): - f = open(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.iface - basename = devname - while basename != "" and basename[-1] in string.digits: - basename = basename[:-1] - - # rules are case senstive for address. Lame. - addr = addr.lower() - - s = "" - if len(dev.description) > 0: - s = "# %s (rule written by anaconda)\n" % (dev.description,) - 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() - def waitForDevicesActivation(self, devices): waited_devs_props = {} |