[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 1/2 rhel6-branch] Do not pass :default:default iscsi nic specification to dracut (#500273)



Instead leave the iscsi_iface_name and netdev_name values out,
i.e. the option should be:
netroot=iscsi:[<username>:<password>[:<reverse>:<password>] ][<servername>]:[<protocol>]:[<port>][:[<iscsi_iface_name>]:[<netdev_name>]]:[<LUN>]:<targetname>

Related: rhbz#500273
---
 storage/devices.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/storage/devices.py b/storage/devices.py
index 25d1bea..96c6238 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -3660,11 +3660,13 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
                 netroot += ":%s:%s" % (auth.reverse_username,
                                        auth.reverse_password)
 
-        netroot += "@%s::%d:%s:%s::%s" % (address,
-                                          self.node.port,
-                                          self.node.iface,
-                                          self.nic,
-                                          self.node.name)
+        iface_spec = ""
+        if self.nic != "default":
+            iface_spec = ":%s:%s" % (self.node.iface, self.nic)
+        netroot += "@%s::%d%s::%s" % (address,
+                                      self.node.port,
+                                      iface_spec,
+                                      self.node.name)
 
         initiator = "iscsi_initiator=%s" % self.initiator
 
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]