Merge branch 'SLE-15-SP3' into sp3-to-master

yast · Aug 3, 2021 · 4183c79 · 4183c79
2 parents efa7cd8 + 0a258de
commit 4183c79
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug  2 14:31:22 UTC 2021 - José Iván López González <jlopez@suse.com>
+
+- Activate devices before probing (bsc#1187220).
+- 4.4.15
+
 -------------------------------------------------------------------
 Wed Jun 16 14:10:33 UTC 2021 - José Iván López González <jlopez@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.4.14
+Version:        4.4.15
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git a/src/lib/installation/clients/inst_disks_activate.rb b/src/lib/installation/clients/inst_disks_activate.rb
@@ -148,7 +148,11 @@ def main
         end
       end
 
-      Y2Storage::StorageManager.instance.probe if @disks_changed
+      if @disks_changed
+        storage = Y2Storage::StorageManager.instance
+        storage.activate
+        storage.probe
+      end
 
       Builtins.y2debug("ret=%1", @ret)
 

diff --git a/test/inst_disks_activate_test.rb b/test/inst_disks_activate_test.rb
@@ -21,6 +21,7 @@
       allow(Yast::Linuxrc).to receive(:InstallInf).with("WithFCoE").and_return("0")
       allow(Yast::UI).to receive(:UserInput).and_return(:abort)
 
+      allow(Y2Storage::StorageManager.instance).to receive(:activate)
       allow(Y2Storage::StorageManager.instance).to receive(:probe)
 
       allow(Yast::SCR).to receive(:Read).with(path(".probe.disk"))