Skip to content

Commit

Permalink
adapt to new ::Storage.light_probe
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Apr 26, 2018
1 parent b1110ce commit 56a6a53
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/include/installation/inst_inc_all.rb
Expand Up @@ -27,7 +27,7 @@
# $Id$
#

require "y2storage"
require "storage"

module Yast
module InstallationInstIncAllInclude
Expand Down Expand Up @@ -241,7 +241,13 @@ def SetDiskActivationModule
# disable disks activation if not needed
iscsi = Linuxrc.InstallInf("WithiSCSI") == "1"
fcoe = Linuxrc.InstallInf("WithFCoE") == "1"
no_disk = ::Y2Storage::StorageManager.instance.probed.disk_devices.empty?
no_disk = begin
::Storage.light_probe
rescue ::Storage::Exception => e
Builtins.y2milestone("light probe failed with #{e}")
# is it safer when problem appear to act like there is no disk
true
end

if !((Arch.s390 && !Arch.is_zkvm) || iscsi || fcoe || no_disk)
Builtins.y2milestone("Disabling disk activation module")
Expand Down

0 comments on commit 56a6a53

Please sign in to comment.