From 7238749b4a6c007712b988825f59d6851f1512cd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 23 Dec 2024 19:39:57 +0100 Subject: [PATCH 1/2] fix reading and writing storage config --- service/lib/agama/dbus/clients/storage.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/service/lib/agama/dbus/clients/storage.rb b/service/lib/agama/dbus/clients/storage.rb index 3f54dfd585..094b2eaccb 100644 --- a/service/lib/agama/dbus/clients/storage.rb +++ b/service/lib/agama/dbus/clients/storage.rb @@ -67,7 +67,8 @@ def finish # # @return [Hash] def config - serialized_config = dbus_object.GetConfig + # Use storage iface to avoid collision with bootloader iface + serialized_config = dbus_object[STORAGE_IFACE].GetConfig JSON.parse(serialized_config, symbolize_names: true) end @@ -76,7 +77,8 @@ def config # @param config [Hash] def config=(config) serialized_config = JSON.pretty_generate(config) - dbus_object.SetConfig(serialized_config) + # Use storage iface to avoid collision with bootloader iface + dbus_object[STORAGE_IFACE].SetConfig(serialized_config) end private From 5824069c12caf1eca9ba8d2ad8790b2be427c677 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 23 Dec 2024 19:43:11 +0100 Subject: [PATCH 2/2] changes --- service/package/rubygem-agama-yast.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes index f16df1bbcf..217912e49d 100644 --- a/service/package/rubygem-agama-yast.changes +++ b/service/package/rubygem-agama-yast.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 23 18:40:01 UTC 2024 - Josef Reidinger + +- Fix collision between hotfix and new bootlaoder dbus interface + (gh#agama-project/agama#1852) + ------------------------------------------------------------------- Fri Dec 20 15:05:11 UTC 2024 - José Iván López González