Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 865707 : "SLES 12 Beta 1 hangs on installation: wickedd and broken network module" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-03-04 18:04:58.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-03-05 11:38:04.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Mar 5 10:11:41 UTC 2014 - mvidner@suse.com + +- bnc#865707 + - use wicked as dhcp client in instsys (by mfilka) + - reverted wickedd-dhcp{6,4}, instead try wicked ifreload + and delete the config if that didn't work +- 3.1.31 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 14 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:33900 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.30.tar.bz2 New: ---- yast2-network-3.1.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.9J3Glo/_old 2014-03-05 13:57:21.000000000 +0100 +++ /var/tmp/diff_new_pack.9J3Glo/_new 2014-03-05 13:57:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.30 +Version: 3.1.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.30.tar.bz2 -> yast2-network-3.1.31.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.30/package/yast2-network.changes new/yast2-network-3.1.31/package/yast2-network.changes --- old/yast2-network-3.1.30/package/yast2-network.changes 2014-03-04 17:44:46.000000000 +0100 +++ new/yast2-network-3.1.31/package/yast2-network.changes 2014-03-05 11:34:44.000000000 +0100 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Mar 5 10:11:41 UTC 2014 - mvidner@suse.com + +- bnc#865707 + - use wicked as dhcp client in instsys (by mfilka) + - reverted wickedd-dhcp{6,4}, instead try wicked ifreload + and delete the config if that didn't work +- 3.1.31 + +------------------------------------------------------------------- Tue Mar 4 16:24:22 UTC 2014 - mvidner@suse.com - Use wickedd-dhcp{6,4} instead of (dropped) dhcpcd-test when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.30/package/yast2-network.spec new/yast2-network-3.1.31/package/yast2-network.spec --- old/yast2-network-3.1.30/package/yast2-network.spec 2014-03-04 17:44:46.000000000 +0100 +++ new/yast2-network-3.1.31/package/yast2-network.spec 2014-03-05 11:34:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.30 +Version: 3.1.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.30/src/clients/inst_setup_dhcp.rb new/yast2-network-3.1.31/src/clients/inst_setup_dhcp.rb --- old/yast2-network-3.1.30/src/clients/inst_setup_dhcp.rb 2014-03-04 17:44:46.000000000 +0100 +++ new/yast2-network-3.1.31/src/clients/inst_setup_dhcp.rb 2014-03-05 11:34:44.000000000 +0100 @@ -6,13 +6,18 @@ include Yast BASH_PATH = Path.new(".target.bash") - WICKED_BIN_DIR = "/usr/lib/wicked/bin" def self.network_cards LanItems.Read LanItems.GetNetcardNames end + # Makes DHCP setup persistent + # + # instsys currently uses wicked as network services "manager" (including + # dhcp client). wicked is currently able to configure a card for dhcp leases + # only via loading config from file. All other ways are workarounds and + # needn't to work when wickedd* services are already running def self.setup_dhcp card index = LanItems.FindDeviceIndex(card) @@ -37,22 +42,24 @@ LanItems.Commit end - def self.get_lease_ipvx?(v, card) - SCR.Execute(BASH_PATH, "#{WICKED_BIN_DIR}/wickedd-dhcp#{v} --test '#{card}' | grep ^IPADDR") == 0 + def self.reload_config(card) + SCR.Execute(BASH_PATH, "wicked ifreload '#{card}'") == 0 end - def self.get_lease?(card) - get_lease_ipvx?(6, card) || get_lease_ipvx?(4, card) - end - - def self.start_dhcp(card) - SCR.Execute(BASH_PATH, "dhcpcd '#{card}'") == 0 + def self.delete_config(devname) + NetworkInterfaces.Delete2(devname) end def self.write_configuration NetworkInterfaces.Write("") end + def self.activate_changes(devnames) + return false if !write_configuration + + devnames.map { |d| reload_config(d) } + end + def self.configured?(devname) # TODO: # one day there should be LanItems.IsItemConfigured, but we currently @@ -63,18 +70,30 @@ NetworkInterfaces.Check(devname) end + # Checks if given device is active + # + # active device <=> a device which is reported as "up" by wicked + def self.active_config?(devname) + wicked_query = "wicked ifstatus --brief #{devname} | grep 'up$'" + SCR.Execute(BASH_PATH, wicked_query) == 0 + end + include Logger -# TODO time consuming, some progress would be nice - dhcp_cards = network_cards.select { |c| !configured?(c) && get_lease?(c) } + dhcp_cards = network_cards.select { |c| !configured?(c) } log.info "Candidates for enabling DHCP: #{dhcp_cards}" - dhcp_cards.each do |dcard| - setup_dhcp(dcard) # make DHCP setup persistent - start_dhcp(dcard) - end + # TODO time consuming, some progress would be nice + dhcp_cards.each { |d| setup_dhcp(d) } + + activate_changes(dhcp_cards) + + # drop devices without dhcp lease + inactive_devices = dhcp_cards.select { |c| ! active_config?(c) } + log.info "Inactive devices: #{inactive_devices}" - write_configuration + inactive_devices.each { |c| delete_config(c) } + activate_changes(inactive_devices) end :next continue with "q"... Checked in at Wed Mar 5 13:58:02 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org