kill #checkUsedStorage completely

yast · Mar 3, 2017 · 8007be0 · 8007be0
1 parent 1d859f6
commit 8007be0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
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
-      true
-    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