From df2958d57d79d4e5139bbb87b89f7b02fefbd614 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2022 08:09:21 +0000
Subject: import udisks2-2.9.0-13.el8


---

diff --git a/SOURCES/udisks-2.10.0-iscsi_test_05_restart_iscsid.patch b/SOURCES/udisks-2.10.0-iscsi_test_05_restart_iscsid.patch
new file mode 100644
index 0000000..eeb5e19
--- /dev/null
+++ b/SOURCES/udisks-2.10.0-iscsi_test_05_restart_iscsid.patch
@@ -0,0 +1,42 @@
+From fbe970add68e6d9d998fb7f78377368c403e200d Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Mon, 31 Oct 2022 15:15:31 +0100
+Subject: [PATCH] tests: Restart iscsid on every InitiatorName change
+
+The test LIO target config expects a specific initiator name as set
+by the ACLs. However the iscsid daemon only seems to be reading
+the InitiatorName string on startup and in case the service is running
+with a different name, the auth tests will fail.
+
+As a workaround, restart the iscsid service after each change.
+A proper way through libiscsi or libopeniscsiusr would be nice -> TODO.
+---
+ src/tests/dbus-tests/test_30_iscsi.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/tests/dbus-tests/test_30_iscsi.py b/src/tests/dbus-tests/test_30_iscsi.py
+index f2594d992..09e975f30 100644
+--- a/src/tests/dbus-tests/test_30_iscsi.py
++++ b/src/tests/dbus-tests/test_30_iscsi.py
+@@ -48,9 +48,21 @@ def _force_lougout(self, target):
+     def _set_initiator_name(self):
+         manager = self.get_object('/Manager')
+ 
++        # make backup of INITIATOR_FILE and restore it at the end
++        try:
++            initiatorname_backup = self.read_file(INITIATOR_FILE)
++            self.addCleanup(self.write_file, INITIATOR_FILE, initiatorname_backup)
++        except FileNotFoundError as e:
++            # no existing file, simply remove it once finished
++            self.addCleanup(self.remove_file, INITIATOR_FILE, True)
++
+         manager.SetInitiatorName(self.initiator, self.no_options,
+                                  dbus_interface=self.iface_prefix + '.Manager.ISCSI.Initiator')
+ 
++        # running iscsid needs to be restarted to reflect the change
++        self.run_command('systemctl try-reload-or-restart iscsid.service')
++        # ignore the return code in case of non-systemd distros
++
+         init = manager.GetInitiatorName(self.no_options,
+                                         dbus_interface=self.iface_prefix + '.Manager.ISCSI.Initiator')
+         self.assertEqual(init, self.initiator)
diff --git a/SPECS/udisks2.spec b/SPECS/udisks2.spec
index 0a3028b..de9e0ef 100644
--- a/SPECS/udisks2.spec
+++ b/SPECS/udisks2.spec
@@ -56,7 +56,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     https://github.com/storaged-project/udisks
@@ -90,6 +90,8 @@ Patch24: udisks-2.10.0-udiskslinuxencrypted_GError.patch
 Patch25: udisks-2.10.0-udiskslinuxpartition_GError.patch
 Patch26: udisks-2.10.0-udiskslinuxpartitiontable_GError.patch
 Patch27: udisks-2.10.0-udiskslinuxfilesystem_GError.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1966460
+Patch28: udisks-2.10.0-iscsi_test_05_restart_iscsid.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -315,6 +317,7 @@ This package contains module for VDO management.
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
 
 %build
@@ -507,6 +510,9 @@ fi
 %endif
 
 %changelog
+* Tue Nov 01 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-13
+- Fix iscsi test auth failures (#1966460)
+
 * Wed Oct 19 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-12
 - Fix iscsi authentication info override (#2135773)