Merge pull request #426 from yast/reprobe-after-dasd

Re-probe after initializing DASD or zFCP
yast · Apr 18, 2018 · c129729 · c129729
2 parents 31b7a58 + 76c486d
commit c129729
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 16 11:45:45 UTC 2018 - igonzalezsosa@suse.com
+
+- Probe storage devices again after initializing DASD or zFCP
+  devices (bsc#1089326 and bsc#1089554).
+- 4.0.48
+
 -------------------------------------------------------------------
 Mon Apr 16 07:53:36 UTC 2018 - lslezak@suse.cz
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.47
+Version:        4.0.48
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_autosetup.rb b/src/clients/inst_autosetup.rb
@@ -258,7 +258,8 @@ def main
 
       # moved here from autoinit for fate #301193
       # needs testing
-      if Arch.s390 && AutoinstConfig.remoteProfile == true
+      s390_and_remote_profile = Arch.s390 && AutoinstConfig.remoteProfile == true
+      if s390_and_remote_profile
         Builtins.y2milestone("arch=s390 and remote_profile=true")
         if Builtins.haskey(Profile.current, "dasd")
           Builtins.y2milestone("dasd found")
@@ -277,7 +278,7 @@ def main
 
       Progress.NextStage
 
-      probe_storage if modified_profile?
+      probe_storage if modified_profile? || s390_and_remote_profile
 
       if Profile.current["partitioning_advanced"] && !Profile.current["partitioning_advanced"].empty?
         write_storage = AutoinstStorage.ImportAdvanced(Profile.current["partitioning_advanced"])