Merge pull request #412 from yast/ng_01

avoid call to old libstorage
yast · Mar 3, 2017 · fb10c12 · fb10c12
2 parents ab0eb3c + 8007be0
commit fb10c12
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar  3 15:33:11 CET 2017 - snwint@suse.de
+
+- storage-ng: avoid call to old libstorage
+- 3.3.5
+
 -------------------------------------------------------------------
 Thu Feb 16 14:47:03 UTC 2017 - ancor@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.3.4
+Version:        3.3.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Bootloader.rb b/src/modules/Bootloader.rb
@@ -63,15 +63,6 @@ def testAbort
       UI.PollInput == :abort
     end
 
-    # bnc #419197 yast2-bootloader does not correctly initialise libstorage
-    # Function try initialize yast2-storage
-    # if other module used it then don't continue with initialize
-    # @return [Boolean] true on success
-
-    def checkUsedStorage
-      Storage.InitLibstorage(true) || !Mode.normal
-    end
-
     # Export bootloader settings to a map
     # @return bootloader settings
     def Export
@@ -143,8 +134,6 @@ def Read
       return false if testAbort
 
       Progress.NextStage
-      return false if !checkUsedStorage
-
       BootStorage.detect_disks
 
       Progress.NextStage

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -87,7 +87,6 @@ def mock_disk_partition
     allow(::Bootloader::UdevMapping).to receive(:to_mountby_device) { |d| d }
     allow(::Bootloader::UdevMapping).to receive(:to_kernel_device) { |d| d }
     allow(::Bootloader::Stage1Device).to receive(:new) { |d| double(real_devices: [d]) }
-    allow(::Yast::Bootloader).to receive(:checkUsedStorage).and_return(true)
     allow(Yast::BootStorage).to receive(:detect_disks) # do not do real disk detection
   end
 end