From e755018dd6e66aea78be5db29c66b9e0493e5611 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Mon, 8 Oct 2018 15:18:18 +0200 Subject: [PATCH] Fix options for ISCSI functions (#1632656) --- ...-options-for-ISCSI-functions-1632656.patch | 42 +++++++++++++++++++ python-blivet.spec | 6 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 0002-Fix-options-for-ISCSI-functions-1632656.patch diff --git a/0002-Fix-options-for-ISCSI-functions-1632656.patch b/0002-Fix-options-for-ISCSI-functions-1632656.patch new file mode 100644 index 0000000..b482f6b --- /dev/null +++ b/0002-Fix-options-for-ISCSI-functions-1632656.patch @@ -0,0 +1,42 @@ +From 48d19a9835ebb6743ec03e4c9182c8cc74db4cf8 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 3 Oct 2018 14:11:08 +0200 +Subject: [PATCH] Fix options for ISCSI functions (#1632656) + +Correct mutual authentication options in UDisks are +"reverse-username" and "reverse-password". +--- + blivet/iscsi.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/blivet/iscsi.py b/blivet/iscsi.py +index b979e01c..ca51f8ed 100644 +--- a/blivet/iscsi.py ++++ b/blivet/iscsi.py +@@ -385,9 +385,9 @@ class iSCSI(object): + if password: + auth_info["password"] = GLib.Variant("s", password) + if r_username: +- auth_info["r_username"] = GLib.Variant("s", r_username) ++ auth_info["reverse-username"] = GLib.Variant("s", r_username) + if r_password: +- auth_info["r_password"] = GLib.Variant("s", r_password) ++ auth_info["reverse-password"] = GLib.Variant("s", r_password) + + args = GLib.Variant("(sqa{sv})", (ipaddr, int(port), auth_info)) + nodes, _n_nodes = self._call_initiator_method("DiscoverSendTargets", args) +@@ -423,9 +423,9 @@ class iSCSI(object): + if password: + auth_info["password"] = GLib.Variant("s", password) + if r_username: +- auth_info["r_username"] = GLib.Variant("s", r_username) ++ auth_info["reverse-username"] = GLib.Variant("s", r_username) + if r_password: +- auth_info["r_password"] = GLib.Variant("s", r_password) ++ auth_info["reverse-password"] = GLib.Variant("s", r_password) + + try: + self._login(node, auth_info) +-- +2.17.1 + diff --git a/python-blivet.spec b/python-blivet.spec index 3d0bd7e..e3efa0a 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.1.1 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 1%{?prerelease}%{?dist} +Release: 2%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -31,6 +31,7 @@ Group: System Environment/Libraries %global realversion %{version}%{?prerelease} Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz Patch0: 0001-force-lvm-plugin.patch +Patch1: 0002-Fix-options-for-ISCSI-functions-1632656.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -191,6 +192,9 @@ configuration. %endif %changelog +* Mon Oct 08 2018 Vojtech Trefny - 3.1.1-2 +- Fix options for ISCSI functions (#1632656) (vtrefny) + * Wed Sep 26 2018 Vojtech Trefny - 3.1.1-1 - Check device dependencies only for device actions (vtrefny) - Allow removing btrfs volumes without btrfs support (vtrefny)