[rpms/python-blivet] rawhide: When starting stratis pool always call StartPool with FD list

[rpms/python-blivet] rawhide: When starting stratis pool always call StartPool with FD list

[Vojtech Trefny]

A new commit has been pushed.

Repo   : rpms/python-blivet
Branch : rawhide
Commit : 2e9bbe5cb74b5a2cf80bdd719aca2111163ac064
Author : Vojtech Trefny <vtrefny@redhat.com>
Date   : 2026-06-17T10:11:15+02:00
Stats  : +46/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/python-blivet/c/2e9bbe5cb74b5a2cf80bdd719aca2111163ac064?branch=rawhide

Log:
When starting stratis pool always call StartPool with FD list

---
diff --git a/0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch b/0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch
new file mode 100644
index 0000000..1bd7e7a
--- /dev/null
+++ b/0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch
@@ -0,0 +1,41 @@
+From 6a405e63bee0d3223d2cac5ae2d7c57c3fd20984 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 14 May 2026 17:11:20 +0200
+Subject: [PATCH] When starting stratis pool always call StartPool with FD list
+
+Stratis 3.9.0 switched to zbus which seems to be more strict when
+validating parameters and requires the file destriptor list to be
+always present, even when not used e.g. when "unlock_method" is
+set to False for StartPool.
+Using the GLibClientUnix client makes sure the FD list is passed
+to the DBus call and we also need to set a valid index to the
+list instead of -1.
+---
+ blivet/devicelibs/stratis.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/blivet/devicelibs/stratis.py b/blivet/devicelibs/stratis.py
+index e91c355bf..85694a198 100644
+--- a/blivet/devicelibs/stratis.py
++++ b/blivet/devicelibs/stratis.py
+@@ -194,7 +194,7 @@ def _unlock_pool_new(pool_uuid, method=None, passphrase=None, keyfile=None):
+ 
+         key_arg = (True, UnixFD(fd))
+     else:
+-        key_arg = (False, -1)
++        key_arg = (False, 0)
+ 
+     try:
+         proxy = util.SystemBus.get_proxy(STRATIS_SERVICE, STRATIS_PATH, STRATIS_MANAGER_INTF_R8,
+@@ -360,8 +360,9 @@ def start_pool(pool_uuid):
+     stratis_info.drop_cache()
+ 
+     try:
+-        proxy = util.SystemBus.get_proxy(STRATIS_SERVICE, STRATIS_PATH, STRATIS_MANAGER_INTF_R8)
+-        ((succ, _uuid), rc, err) = proxy.StartPool(pool_uuid, "uuid", (False, (False, 0)), (False, -1),
++        proxy = util.SystemBus.get_proxy(STRATIS_SERVICE, STRATIS_PATH, STRATIS_MANAGER_INTF_R8,
++                                         client=GLibClientUnix)
++        ((succ, _uuid), rc, err) = proxy.StartPool(pool_uuid, "uuid", (False, (False, 0)), (False, 0),
+                                                    timeout=STRATIS_CALL_TIMEOUT)
+     except DBusError as e:
+         raise StratisError("Failed to start stratis pool '%s': %s" % (pool_uuid, str(e)))

diff --git a/python-blivet.spec b/python-blivet.spec
index decc811..da09057 100644
--- a/python-blivet.spec
+++ b/python-blivet.spec
@@ -5,7 +5,7 @@ Version: 3.13.2
 
 #%%global prerelease .b2
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 3%{?prerelease}%{?dist}
+Release: 4%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPL-2.1-or-later
 %global realname blivet
@@ -18,6 +18,7 @@ Patch0: 0001-remove-btrfs-plugin.patch
 %endif
 
 Patch1: 0002-Ignore-btrfs-mount-errors-during-storage-scan.patch
+Patch2: 0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -135,6 +136,9 @@ make DESTDIR=%{buildroot} install
 %{python3_sitelib}/*
 
 %changelog
+* Wed Jun 17 2026 Vojtech Trefny <vtrefny@redhat.com> - 1:3.13.2-4
+- When starting stratis pool always call StartPool with FD list
+
 * Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 1:3.13.2-3
 - Rebuilt for Python 3.15