[PATCH rhel6-branch] Revert "Use edd fcoe boot option instead of enumerating all ifaces" (#1103920)

Radek Vykydal rvykydal at redhat.com
Mon Sep 8 09:10:36 UTC 2014


This reverts commit 479cb1ca481b88b9cd2e861be03dd2c28d32e18c.

Resolves: rhbz#1103920

We can revert the change for #909463 now that the bz issue is properly
fixed in dracut (#1022766)

The original issue was that dracut connected to LUNs only via interface
specified by the last of fcoe:<ifaceX>... boot options which made multipath
cases with this last interface not physically connected during boot not work
(boot).  Patched dracut now connects to LUNs via all interfaces specified by
fcoe:<ifaceX> commands which makes anaconda patch we are reverting no longer
needed.
---
 storage/devices.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/storage/devices.py b/storage/devices.py
index c50c01c..e179339 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -3782,7 +3782,10 @@ class FcoeDiskDevice(DiskDevice, NetworkStorageDevice):
         else:
             dcbOpt = "nodcb"
 
-        return set(["fcoe=edd:%s" % dcbOpt])
+        if nic in fcoe().ksnics:
+            return set(["fcoe=%s:%s" % (nic, dcbOpt)])
+        else:
+            return set(["fcoe=edd:%s" % dcbOpt])
 
 
 class OpticalDevice(StorageDevice):
-- 
1.9.3



More information about the anaconda-patches mailing list