Merge pull request #1001 from joseivanlopez/improve_detect_windows

Improve performance of Windows detection
yast · Dec 5, 2019 · 9120202 · 9120202
2 parents 3d94a5e + 0727e03
commit 9120202
Show file tree

Hide file tree

Showing 22 changed files with 1,485 additions and 811 deletions.
diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec  4 12:17:37 UTC 2019 - José Iván López González <jlopez@suse.com>
+
+- Improve detection of Windows systems (related to bsc#1135341).
+- 4.2.60
+
 -------------------------------------------------------------------
 Wed Nov 27 13:53:57 UTC 2019 - Christopher Hofmann <cwh@suse.com>
 

diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-storage-ng
-Version:        4.2.59
+Version:        4.2.60
 Release:        0
 Summary:        YaST2 - Storage Configuration
 License:        GPL-2.0-only OR GPL-3.0-only

diff --git a/src/lib/y2storage.rb b/src/lib/y2storage.rb
@@ -1,4 +1,4 @@
-# Copyright (c) [2016-2017] SUSE LLC
+# Copyright (c) [2016-2019] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -64,7 +64,7 @@
 require "y2storage/exceptions"
 require "y2storage/boot_requirements_checker"
 require "y2storage/disk_analyzer"
-require "y2storage/existing_filesystem"
+require "y2storage/filesystem_reader"
 require "y2storage/disk_size"
 require "y2storage/fake_device_factory"
 require "y2storage/free_disk_space"

diff --git a/src/lib/y2storage/blk_device.rb b/src/lib/y2storage/blk_device.rb
@@ -631,6 +631,15 @@ def in_network?
       false
     end
 
+    # Whether the block device fulfills conditions to be used for a Windows system
+    #
+    # Note that only partitions can be used for installing Windows.
+    #
+    # @return [Boolean]
+    def windows_suitable?
+      false
+    end
+
     protected
 
     # Values for volume specification matching

diff --git a/src/lib/y2storage/boot_requirements_strategies/raspi.rb b/src/lib/y2storage/boot_requirements_strategies/raspi.rb
@@ -1,4 +1,4 @@
-# Copyright (c) [2018] SUSE LLC
+# Copyright (c) [2018-2019] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -18,7 +18,6 @@
 # find current contact information at www.suse.com.
 
 require "y2storage/boot_requirements_strategies/uefi"
-require "y2storage/existing_filesystem"
 
 module Y2Storage
   module BootRequirementsStrategies
@@ -114,7 +113,7 @@ def rpi_boot?(partition)
         filesystem = partition.direct_blk_filesystem
         return false if filesystem.nil? || !filesystem.type.is?(:vfat)
 
-        ExistingFilesystem.new(filesystem).rpi_boot?
+        filesystem.rpi_boot?
       end
 
       # First partition in a disk