[PATCH rhel7-alpha2-branch 12/16] Do not pass :default:default iscsi nic specification to dracut (#500273)

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

 



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
---
 pyanaconda/storage/devices.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index 636f5ad..4c63bb5 100644
--- a/pyanaconda/storage/devices.py
+++ b/pyanaconda/storage/devices.py
@@ -3669,11 +3669,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

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux