diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2010-11-02 16:25:53 +0100 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2010-11-03 10:47:07 +0100 |
| commit | 151b4b0b56a47b3823880d6c5dea051e616d2134 (patch) | |
| tree | 15a9dcc333cebda8dd9f1ab11d4bdd80246bec83 /pyanaconda/network.py | |
| parent | 517213ccdf0cacd499053d9e6c57f1fbbfae6f29 (diff) | |
| download | anaconda-151b4b0b56a47b3823880d6c5dea051e616d2134.tar.gz anaconda-151b4b0b56a47b3823880d6c5dea051e616d2134.tar.xz anaconda-151b4b0b56a47b3823880d6c5dea051e616d2134.zip | |
Do not rely on presence of DEVICE setting in ifcfg files.
nm-c-e is not writing it out, and we can stumble over it
in Live CD environment, see bz #648635 for example.
Diffstat (limited to 'pyanaconda/network.py')
| -rw-r--r-- | pyanaconda/network.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 2c83ffee4..8b567d535 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -549,7 +549,7 @@ class Network: # ipv4 and ipv6 if dev.get("ONBOOT"): line += " --onboot %s" % dev.get("ONBOOT") - line += " --device %s" % dev.get("DEVICE") + line += " --device %s" % dev.iface if dev.get('MTU') and dev.get('MTU') != "0": line += " --mtu=%s" % dev.get('MTU') @@ -742,7 +742,7 @@ class Network: addr = dev.get("HWADDR") if not addr: continue - devname = dev.get("DEVICE") + devname = dev.iface basename = devname while basename != "" and basename[-1] in string.digits: basename = basename[:-1] |