From ddd8b14f1855d06ea65fdf784b8dd5028d237cc2 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <wfeldt@opensuse.org>
Date: Wed, 2 Mar 2022 19:20:36 +0100
Subject: [PATCH] detach local source media and reprobe when doing the storage
 proposal

---
 src/lib/y2storage/clients/inst_disk_proposal.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/lib/y2storage/clients/inst_disk_proposal.rb b/src/lib/y2storage/clients/inst_disk_proposal.rb
index 606f5dd5d6..00666c19e3 100755
--- a/src/lib/y2storage/clients/inst_disk_proposal.rb
+++ b/src/lib/y2storage/clients/inst_disk_proposal.rb
@@ -50,6 +50,8 @@ class InstDiskProposal
       def initialize
         textdomain "storage"
 
+        detach_media_and_reprobe
+
         @devicegraph = storage_manager.staging
         @proposal = storage_manager.proposal
         # Save staging revision to check later if the system was reprobed
@@ -89,6 +91,18 @@ def run
 
       private
 
+      # weird stuff
+      #
+      # Local (disk) media sources should not be mounted as the additional
+      # mountpoints will confuse libstorage-ng when doing the commit.
+      def detach_media_and_reprobe
+        Yast.import "PackageCallbacks"
+        log.info("XXX inst_disk_proposal")
+
+        Pkg.SourceReleaseAll
+        storage_manager.probe
+      end
+
       # @return [Integer]
       attr_reader :initial_staging_revision