- disable mdadm auto assemble during DASD dialog

yast · May 8, 2018 · 3d8bd31 · 3d8bd31
1 parent f88a278
commit 3d8bd31
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 08 14:01:56 CEST 2018 - aschnell@suse.com
+
+- disable mdadm auto assemble during DASD dialog (bsc#1089645)
+- 4.0.4
+
 -------------------------------------------------------------------
 Tue Mar 20 15:12:15 UTC 2018 - jreidinger@suse.com
 

diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-s390
-Version:        4.0.3
+Version:        4.0.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -31,6 +31,11 @@ BuildRequires:	yast2-ruby-bindings >= 3.1.7
 BuildRequires:  rubygem(%rb_default_ruby_abi:rspec)
 BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
 BuildRequires:	update-desktop-files
+
+# Y2Storage::Inhibitors
+BuildRequires: yast2-storage-ng >= 4.0.175
+Requires:      yast2-storage-ng >= 4.0.175
+
 ExclusiveArch:  s390 s390x
 Requires:	yast2
 Requires:	yast2-ruby-bindings >= 3.1.7

diff --git a/src/include/s390/dasd/wizards.rb b/src/include/s390/dasd/wizards.rb
@@ -24,6 +24,9 @@
 # Summary:	Wizards definitions
 # Authors:	Jiri Srain <jsrain@suse.cz>
 #
+
+require "y2storage/inhibitors"
+
 module Yast
   module S390DasdWizardsInclude
     def initialize_s390_dasd_wizards(include_target)
@@ -80,7 +83,13 @@ def DASDSequence
       Wizard.CreateDialog
       Wizard.SetDesktopIcon("dasd")
 
-      ret = Sequencer.Run(aliases, sequence)
+      begin
+        inhibitors = Y2Storage::Inhibitors.new
+        inhibitors.inhibit
+        ret = Sequencer.Run(aliases, sequence)
+      ensure
+        inhibitors.uninhibit
+      end
 
       Wizard.CloseDialog