Skip to content

Commit

Permalink
Fixed writing of udev rule in AY's second stage. bnc#956605
Browse files Browse the repository at this point in the history
  • Loading branch information
mchf committed Nov 25, 2015
1 parent 8c8ed0e commit 9f3b836
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/modules/LanItems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def main
Yast.import "NetworkConfig"
Yast.import "NetworkStorage"
Yast.import "Storage"
Yast.import "Stage"
Yast.include self, "network/complex.rb"
Yast.include self, "network/routines.rb"
Yast.include self, "network/lan/s390.rb"
Expand Down Expand Up @@ -739,7 +740,16 @@ def write
SetItemName(item_id, renamed_to(item_id))
end

LanItems.WriteUdevRules if LanUdevAuto.AllowUdevModify
# FIXME: in case of AY, writing udev rules was partly moved into first stage
# (bnc#955217). However, it is so only in case of ssh / vnc installation.
# Otherwise, udev rules are written in second stage in *LanUdevAuto* module
# and it breaks consistency of data stored in Items. So, moving writing
# udev rules into first stage should be completed ASAP even fo non-ssh / vnc
# AY installations and LanUdevAuto module should be dropped.
# When refactored at least these use cases need to be retested:
# - bnc#955217
# - bnc#956605
LanItems.WriteUdevRules if !Stage.cont && LanUdevAuto.AllowUdevModify

# FIXME: hack: no "netcard" filter as biosdevname names it diferently (bnc#712232)
NetworkInterfaces.Write("")
Expand Down

0 comments on commit 9f3b836

Please sign in to comment.