Skip to content

Commit

Permalink
Merge pull request #69 from joseivanlopez/activate_vgs
Browse files Browse the repository at this point in the history
Fix bug showing systems
  • Loading branch information
joseivanlopez committed Mar 17, 2017
2 parents 67674b8 + 8aecf25 commit 4b20ad5
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions src/modules/RootPart.rb
Expand Up @@ -1907,17 +1907,6 @@ def CheckPartition(partition)

freshman[:valid] = fstab_entry_matches?(fstab[0], p_dev)

# Why this doesn't match?
# Possible reasons:
# - /var not mounted so hwinfo cannot translate device names
if !freshman[:valid]
Builtins.y2warning(
"Device does not match fstab: '%1' vs. '%2'",
p_dev,
Ops.get_string(fstab, [0, "spec"], "")
)
end

if Mode.autoinst
# we dont care about the other checks in autoinstallation
SCR.Execute(path(".target.umount"), Installation.destdir)
Expand Down Expand Up @@ -2173,8 +2162,14 @@ def staging
end

def fstab_entry_matches?(entry, dev)
return false unless entry["spec"]
probed.partitions.with(name: entry["spec"]).any?
spec = entry["spec"]
return true if spec == dev

# Why this doesn't match?
# Possible reasons:
# - /var not mounted so hwinfo cannot translate device names
Builtins.y2warning("Device does not match fstab: '%1' vs. '%2'", dev, spec)
return false
end

def update_staging!
Expand Down

0 comments on commit 4b20ad5

Please sign in to comment.