Merge pull request #96 from yast/merge_SLE-15-SP1

Merge SLE-15-SP1 into 'master'
yast · Mar 10, 2020 · 82c53cf · 82c53cf
2 parents d2349fd + 46cf9de
commit 82c53cf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 10 09:29:52 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Handle the iscsi service status (restart, start...) change after
+  the iscsid and the iscsiuio sockets (bsc#1160606)
+- 4.2.5
+
 -------------------------------------------------------------------
 Fri Jan 17 10:17:29 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-iscsi-client.spec b/package/yast2-iscsi-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-iscsi-client
-Version:        4.2.4
+Version:        4.2.5
 Release:        0
 Summary:        YaST2 - iSCSI Client Configuration
 Group:          System/YaST

diff --git a/src/modules/IscsiClient.rb b/src/modules/IscsiClient.rb
@@ -76,10 +76,16 @@ def main
     #
     # @return [Yast2::CompundService]
     def services
+      # TODO: Having a combination of services and sockets in a compoud service
+      #   do not smell very well and the user might be very carefull on the
+      #   'after reboot' selection having to choose correctly for enabling the
+      #   desired option (bsc#1160606).
       @services ||= Yast2::CompoundService.new(
-        Yast2::SystemService.find("iscsi"),
         Yast2::SystemService.find("iscsid"),
-        Yast2::SystemService.find("iscsiuio")
+        Yast2::SystemService.find("iscsiuio"),
+        # It seems that moving it to the end help when iscsid socket is active
+        # and need to be restarted. (bsc#853300, bsc#1160606)
+        Yast2::SystemService.find("iscsi")
       )
     end