Merge branch 'newui' into newui-ks-part

1 files changed, 4 insertions, 14 deletions

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 3ef03b833..971c0dc16 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -28,12 +28,13 @@ import struct
 
 from pyanaconda import iutil
 from pyanaconda.storage.devicelibs import mdraid
-from pyanaconda.isys import sync
+from pyanaconda.isys import sync, getMacAddress
 from pyanaconda.product import productName
 from pyanaconda.flags import flags
 from pyanaconda.constants import *
 from pyanaconda.storage.errors import StorageError
 from pyanaconda.storage.fcoe import fcoe
+import pyanaconda.network
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
@@ -750,14 +751,11 @@ class BootLoader(object):
             Keyword Arguments:
 
                 storage - a pyanaconda.storage.Storage instance
-                network - a pyanaconda.network.Network instance (for network
-                          storage devices' boot arguments)
 
             All other arguments are expected to have a dracutSetupArgs()
             method.
         """
         storage = kwargs.pop("storage", None)
-        network = kwargs.pop("network", None)
 
         #
         # FIPS
@@ -811,15 +809,7 @@ class BootLoader(object):
                 # network storage
                 # XXX this is nothing to be proud of
                 if isinstance(dep, NetworkStorageDevice):
-                    if network is None:
-                        log.error("missing network instance for setup of boot "
-                                  "command line for network storage device %s"
-                                  % dep.name)
-                        raise BootLoaderError("missing network instance when "
-                                              "setting boot args for network "
-                                              "storage device")
-
-                    setup_args = network.dracutSetupArgs(dep)
+                    setup_args = pyanaconda.network.dracutSetupArgs(dep)
                     self.boot_args.update(setup_args)
                     self.dracut_args.update(setup_args)
 
@@ -845,7 +835,7 @@ class BootLoader(object):
         # Dracut needs the explicit ifname= because biosdevname
         # fails to rename the iface (because of BFS booting from it).
         for nic, dcb, auto_vlan in fcoe().nics:
-            hwaddr = network.netdevices[nic].get("HWADDR")
+            hwaddr = getMacAddress(nic)
             self.boot_args.add("ifname=%s:%s" % (nic, hwaddr.lower()))
 
         #