Merge pull request #125 from yast/huha-iscsiuio-sp5

Add Support Packages on Demand [SLE-15-SP5]

package/yast2-iscsi-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 19 14:01:12 UTC 2023 - Stefan Hundhammer <[email protected]>
+
+- Add support packages on demand (bsc#1214273)
+- 4.5.8
+
 -------------------------------------------------------------------
 Thu Feb 10 16:29:34 UTC 2023 - Ancor Gonzalez Sosa <[email protected]>
 

package/yast2-iscsi-client.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-iscsi-client
-Version:        4.5.7
+Version:        4.5.8
 Release:        0
 Summary:        YaST2 - iSCSI Client Configuration
 License:        GPL-2.0-only

src/modules/IscsiClient.rb

@@ -37,6 +37,8 @@
 
 module Yast
   class IscsiClientClass < Module
+    include Yast::Logger
+
     def main
       textdomain "iscsi-client"
 
@@ -99,23 +101,17 @@ def Modified
 
     # check if package open-iscsi is installed
     def installed_packages
-      # don't check interactively for packages (bnc#367300)
-      # skip it during second stage or when create AY profile
-      return true if Stage.cont || Stage.initial || Mode.config
-      Builtins.y2milestone("Check if open-iscsi package installed")
-      ret = false
-      if !Package.InstallMsg(
-        "open-iscsi",
-        _(
-          "<p>To configure the iSCSI initiator, the <b>%1</b> package must be installed.</p>"
-        ) +
-          _("<p>Install it now?</p>")
-      )
-        Popup.Error(Message.CannotContinueWithoutPackagesInstalled)
-      else
-        ret = true
-      end
-      ret
+      needed_packages = ["open-iscsi"]
+      needed_packages << "iscsiuio" if IscsiClientLib.iscsiuio_relevant?
+      log.info("Needed packages: #{needed_packages}")
+      # Install the packages, if needed. Ask the user for confirmation.
+      # If it fails, warn the user about YaST possibly failing and ask for
+      # confirmation.
+      #
+      # Notice that this takes care of AutoYaST mode and creating an AutoYaST
+      # profile; and during initial installation, it simply adds the packages
+      # to the install set.
+      Package.CheckAndInstallPackagesInteractive(needed_packages)
     end
 
     # Dump the iscsi-client settings to a single map
@@ -202,7 +198,7 @@ def Read
       return false if false
       Builtins.sleep(sl)
 
-      # check if required package is installed
+      # check if required packages are installed
       return false if !installed_packages
       return false if IscsiClientLib.getiBFT == nil
       # Progress finished