diff options
| author | Chris Lumens <clumens@redhat.com> | 2010-02-08 10:30:02 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2010-02-08 10:30:02 -0500 |
| commit | 6e2b508fb660e679611a7793d6a240015b9c060d (patch) | |
| tree | 6ed26e28386d9714876edce18e826c6288d8cd27 /network.py | |
| parent | 2a0907636de04d1ea712730d972bcb1b3b7e27bb (diff) | |
| parent | bdf00bc0dd36d7bd6c4cca5c2ec4b5780330ff4e (diff) | |
| download | anaconda-6e2b508fb660e679611a7793d6a240015b9c060d.tar.gz anaconda-6e2b508fb660e679611a7793d6a240015b9c060d.tar.xz anaconda-6e2b508fb660e679611a7793d6a240015b9c060d.zip | |
Merge branch 'no-instdata'
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/network.py b/network.py index e75a10ade..83b999888 100644 --- a/network.py +++ b/network.py @@ -111,7 +111,7 @@ def getDefaultHostname(anaconda): return hn try: - hn = anaconda.id.network.hostname + hn = anaconda.network.hostname except: hn = None @@ -596,10 +596,10 @@ class Network: # installation when / is on a network backed device. if anaconda is not None: import storage - rootdev = anaconda.id.storage.rootDevice + rootdev = anaconda.storage.rootDevice # FIXME: use d.host_address to only add "NM_CONTROLLED=no" # for interfaces actually used enroute to the device - for d in anaconda.id.storage.devices: + for d in anaconda.storage.devices: if isinstance(d, storage.devices.NetworkStorageDevice) and\ (rootdev.dependsOn(d) or d.nic == device): f.write("NM_CONTROLLED=no\n") |