Merge pull request #26 from aschnell/Code-11-SP3

- deactivate RAID before going back to "Disk Activation" during installation (bnc#806454)
yast · Mar 4, 2013 · 21307d0 · 21307d0
2 parents 1e11b4f + 8d5bd74
commit 21307d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 04 14:42:03 CET 2013 - aschnell@suse.de
+
+- deactivate RAID before going back to "Disk Activation" during
+  installation (bnc#806454)
+
 -------------------------------------------------------------------
 Thu Feb 28 18:47:44 CET 2013 - jsuchome@suse.cz
 

diff --git a/src/clients/inst_system_analysis.ycp b/src/clients/inst_system_analysis.ycp
@@ -42,6 +42,7 @@ include "packager/storage_include.ycp";
     // This dialog in not interactive
     // always return `back when came from the previous dialog
     if (GetInstArgs::going_back()) {
+	Storage::ActivateHld(false);
 	return `back;
     }
 
@@ -163,6 +164,7 @@ Check your hardware.
     }
 
     boolean SearchForLinuxPartitions () {
+	Storage::ReReadTargetMap();
 	if (Storage::HaveLinuxPartitions ()) {
 	    InstData::have_linux = true;
 	}