From 22c95e5582767a173dc0759f15efa95db4e3d67b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 1 Sep 2023 22:15:46 +0200 Subject: [PATCH 1/3] Bump version to 4.6.0 --- package/yast2-iscsi-client.changes | 5 +++++ package/yast2-iscsi-client.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes index ea06fea..44beacb 100644 --- a/package/yast2-iscsi-client.changes +++ b/package/yast2-iscsi-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger + +- Branch package for SP6 (bsc#1208913) + ------------------------------------------------------------------- Thu Feb 10 16:29:34 UTC 2023 - Ancor Gonzalez Sosa diff --git a/package/yast2-iscsi-client.spec b/package/yast2-iscsi-client.spec index fd1c086..734181b 100644 --- a/package/yast2-iscsi-client.spec +++ b/package/yast2-iscsi-client.spec @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 4.5.7 +Version: 4.6.0 Release: 0 Summary: YaST2 - iSCSI Client Configuration License: GPL-2.0-only From dd8277f0c225f621c71cf95a474bdfd7cfd5039b Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Thu, 14 Sep 2023 10:17:08 +0200 Subject: [PATCH 2/3] Add support packages on demand (bsc#1214273) --- src/modules/IscsiClient.rb | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/modules/IscsiClient.rb b/src/modules/IscsiClient.rb index 485088e..6fae218 100644 --- a/src/modules/IscsiClient.rb +++ b/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", - _( - "

To configure the iSCSI initiator, the %1 package must be installed.

" - ) + - _("

Install it now?

") - ) - 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 From 92676c24ef5cac7e1c814748d57af1ea54f8e16d Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Tue, 19 Sep 2023 16:02:20 +0200 Subject: [PATCH 3/3] Version bump and change log --- package/yast2-iscsi-client.changes | 6 ++++++ package/yast2-iscsi-client.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes index ea06fea..6ab5229 100644 --- a/package/yast2-iscsi-client.changes +++ b/package/yast2-iscsi-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 19 14:01:12 UTC 2023 - Stefan Hundhammer + +- Add support packages on demand (bsc#1214273) +- 4.5.8 + ------------------------------------------------------------------- Thu Feb 10 16:29:34 UTC 2023 - Ancor Gonzalez Sosa diff --git a/package/yast2-iscsi-client.spec b/package/yast2-iscsi-client.spec index fd1c086..22111aa 100644 --- a/package/yast2-iscsi-client.spec +++ b/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