Merge pull request #4935 from vojtechtrefny/master_iscsi-initiatornam…

…e-change

iscsi: Allow changing iSCSI initiator name once set

anaconda.spec.in

@@ -41,7 +41,7 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 %define nmver 1.0
 %define pykickstartver 3.47-1
 %define pypartedver 2.5-2
-%define pythonblivetver 1:3.7.1-4
+%define pythonblivetver 1:3.8.1-1
 %define rpmver 4.15.0
 %define simplelinever 1.9.0-1
 %define subscriptionmanagerver 1.26

pyanaconda/modules/storage/iscsi/iscsi.py

@@ -69,7 +69,7 @@ def set_initiator(self, initiator):
 
         :param initiator: a name of the initiator
         """
-        if not iscsi.initiator_set:
+        if not iscsi.initiator_set or (initiator != iscsi.initiator and self.can_set_initiator()):
             iscsi.initiator = initiator
             self.initiator_changed.emit()
             log.debug("The iSCSI initiator is set to '%s'.", initiator)
@@ -79,9 +79,10 @@ def set_initiator(self, initiator):
     def can_set_initiator(self):
         """Can the initiator be set?
 
-        Once the initiator name is set it can't be changed.
+        Initiator name can be changed when no sessions are active.
         """
-        return not iscsi.initiator_set
+        active = iscsi._get_active_sessions()
+        return not active
 
     def get_interface_mode(self):
         """Get the mode of interfaces used for iSCSI operations.

pyanaconda/modules/storage/iscsi/iscsi_interface.py

@@ -71,11 +71,7 @@ def Initiator(self, initiator: Str):
     def CanSetInitiator(self) -> Bool:
         """Can the iSCSI initator be set?
 
-        Once the initiator name is set it can't be changed.
-        FIXME
-        Investigate if it needs to be so strict? Perhaps it has to be frozen only
-        once there are active nodes logged in, or once any nodes were discovered.
-        This would need to be changed in blivet/iscsi.py.
+        Initiator name can be changed when no sessions are active.
         """
         return self.implementation.can_set_initiator()