diff options
| author | David Lehman <dlehman@redhat.com> | 2013-01-14 17:48:37 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2013-01-28 13:15:31 -0600 |
| commit | 9040049d8d232eae3f0f51ffe442dbe49d273bce (patch) | |
| tree | 5966597dd00948b4eae345a9dc8b509ebb0dab00 /pyanaconda/network.py | |
| parent | e6c6261e1d7e912103ef1618e4a84c5f70abb00a (diff) | |
| download | anaconda-9040049d8d232eae3f0f51ffe442dbe49d273bce.tar.gz anaconda-9040049d8d232eae3f0f51ffe442dbe49d273bce.tar.xz anaconda-9040049d8d232eae3f0f51ffe442dbe49d273bce.zip | |
Remove the storage module and replace it with blivet.
Diffstat (limited to 'pyanaconda/network.py')
| -rw-r--r-- | pyanaconda/network.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 1f2bf1961..1c6762555 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -39,8 +39,8 @@ import re from flags import flags from simpleconfig import IfcfgFile import urlgrabber.grabber -from pyanaconda.storage.devices import FcoeDiskDevice, iScsiDiskDevice -from pyanaconda.storage import arch +from blivet.devices import FcoeDiskDevice, iScsiDiskDevice +import blivet.arch import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -272,7 +272,7 @@ class NetworkDevice(IfcfgFile): def __str__(self): s = "" keys = self.info.keys() - if arch.isS390() and ("HWADDR" in keys): + if blivet.arch.isS390() and ("HWADDR" in keys): keys.remove("HWADDR") # make sure we include autoneg in the ethtool line if 'ETHTOOL_OPTS' in keys: @@ -597,7 +597,7 @@ def dracutBootArguments(ifcfg, storage_ipaddr, hostname=None): nettype = ifcfg.get("NETTYPE") subchannels = ifcfg.get("SUBCHANNELS") - if arch.isS390() and nettype and subchannels: + if blivet.arch.isS390() and nettype and subchannels: znet = "rd.znet=%s,%s" % (nettype, subchannels) options = ifcfg.get("OPTIONS").strip("'\"") if options: |