Skip to content

Commit

Permalink
Changes based on CR.
Browse files Browse the repository at this point in the history
  • Loading branch information
teclator authored and mchf committed Mar 21, 2019
1 parent ddb7fd9 commit 25c8bb6
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/modules/LanItems.rb
Expand Up @@ -2128,6 +2128,8 @@ def Commit

when "ib"
newdev["IPOIB_MODE"] = @ipoib_mode
when "dummy"
newdev["INTERFACETYPE"] = @type
end

if DriverType(@type) == "ctc"
Expand All @@ -2150,14 +2152,6 @@ def Commit
}
end

# L3: bnc#585458
# FIXME: INTERFACETYPE confuses sysconfig, bnc#458412
# Only test when newdev has enough info for GetTypeFromIfcfg to work.
implied_type = NetworkInterfaces.GetTypeFromIfcfg(newdev)
if @type == "dummy" || !implied_type.nil? && implied_type != @type
newdev["INTERFACETYPE"] = @type
end

# ZONE uses an empty string as the default ZONE which means that is not
# the same than not defining the attribute
current_map = (GetCurrentMap() || {}).select { |k, v| !v.nil? && (k == "ZONE" || !v.empty?) }
Expand Down

0 comments on commit 25c8bb6

Please sign in to comment.