Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-03-06 19:29:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-03-01 14:38:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-03-06 19:29:38.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Mar 5 10:11:41 UTC 2014 - [email protected] + +- 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 - [email protected] + +- Use wickedd-dhcp{6,4} instead of (dropped) dhcpcd-test when + setting up DHCP interfaces (bnc#866617) +- 3.1.30 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.29.tar.bz2 New: ---- yast2-network-3.1.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.P2prdt/_old 2014-03-06 19:29:39.000000000 +0100 +++ /var/tmp/diff_new_pack.P2prdt/_new 2014-03-06 19:29:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.29 +Version: 3.1.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.29.tar.bz2 -> yast2-network-3.1.31.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.29/package/yast2-network.changes new/yast2-network-3.1.31/package/yast2-network.changes --- old/yast2-network-3.1.29/package/yast2-network.changes 2014-02-28 17:03:50.000000000 +0100 +++ new/yast2-network-3.1.31/package/yast2-network.changes 2014-03-06 10:00:20.000000000 +0100 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Wed Mar 5 10:11:41 UTC 2014 - [email protected] + +- 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 - [email protected] + +- Use wickedd-dhcp{6,4} instead of (dropped) dhcpcd-test when + setting up DHCP interfaces (bnc#866617) +- 3.1.30 + +------------------------------------------------------------------- Fri Feb 28 15:30:41 UTC 2014 - [email protected] - fix installation crash - do not mess ruby global namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.29/package/yast2-network.spec new/yast2-network-3.1.31/package/yast2-network.spec --- old/yast2-network-3.1.29/package/yast2-network.spec 2014-02-28 17:03:50.000000000 +0100 +++ new/yast2-network-3.1.31/package/yast2-network.spec 2014-03-06 10:00:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.29 +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.29/src/clients/inst_setup_dhcp.rb new/yast2-network-3.1.31/src/clients/inst_setup_dhcp.rb --- old/yast2-network-3.1.29/src/clients/inst_setup_dhcp.rb 2014-02-28 17:03:50.000000000 +0100 +++ new/yast2-network-3.1.31/src/clients/inst_setup_dhcp.rb 2014-03-06 10:00:20.000000000 +0100 @@ -12,6 +12,12 @@ 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) @@ -36,18 +42,24 @@ LanItems.Commit end - def self.get_lease?(card) - SCR.Execute(BASH_PATH, "dhcpcd-test '#{card}'") == 0 + def self.reload_config(card) + SCR.Execute(BASH_PATH, "wicked ifreload '#{card}'") == 0 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 @@ -58,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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.29/testsuite/tests/Network_YaPI.out new/yast2-network-3.1.31/testsuite/tests/Network_YaPI.out --- old/yast2-network-3.1.29/testsuite/tests/Network_YaPI.out 2014-02-28 17:03:50.000000000 +0100 +++ new/yast2-network-3.1.31/testsuite/tests/Network_YaPI.out 2014-03-06 10:00:20.000000000 +0100 @@ -11,7 +11,6 @@ Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 -Read .target.stat "/usr/lib/systemd/system/SuSEfirewall2.service" $["exists":true] Execute .target.bash "/bin/systemctl is-enabled SuSEfirewall2.service" 0 Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"] Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"] @@ -269,13 +268,10 @@ Write .network.value."eth0".BOOTPROTO "dhcp4" true Write .network.value."eth0".STARTMODE "auto" true Write .network nil true -Read .target.stat "/usr/lib/systemd/system/network.service" $["exists":true] Execute .target.bash_output "/bin/systemctl restart network.service" $["TERM":"raw"] $["exit":0, "stdout":"laptop.suse.cz"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] -Read .target.stat "/usr/lib/systemd/system/SuSEfirewall2.service" $["exists":true] Execute .target.bash "/bin/systemctl is-enabled SuSEfirewall2.service" 0 -Read .target.stat "/usr/lib/systemd/system/SuSEfirewall2.service" $["exists":true] Execute .target.bash "/bin/systemctl is-enabled SuSEfirewall2.service" 0 Execute .target.bash "echo 0 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" 0 @@ -346,7 +342,6 @@ Write .network.value."eth3".IPADDR "1.2.3.7/24" true Write .network.value."eth3".STARTMODE "auto" true Write .network nil true -Read .target.stat "/usr/lib/systemd/system/network.service" $["exists":true] Execute .target.bash_output "/bin/systemctl restart network.service" $["TERM":"raw"] $["exit":0, "stdout":"laptop.suse.cz"] Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"] Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"] @@ -413,5 +408,4 @@ Write .network.value."eth5.23".STARTMODE "auto" true Write .network.value."eth5.23".VLAN_ID "42" true Write .network nil true -Read .target.stat "/usr/lib/systemd/system/network.service" $["exists":true] Execute .target.bash_output "/bin/systemctl restart network.service" $["TERM":"raw"] $["exit":0, "stdout":"laptop.suse.cz"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.29/testsuite/tests/YaPI_bond.out new/yast2-network-3.1.31/testsuite/tests/YaPI_bond.out --- old/yast2-network-3.1.29/testsuite/tests/YaPI_bond.out 2014-02-28 17:03:50.000000000 +0100 +++ new/yast2-network-3.1.31/testsuite/tests/YaPI_bond.out 2014-03-06 10:00:20.000000000 +0100 @@ -17,5 +17,4 @@ Write .network.value."bond0".IPADDR "4.3.2.1/24" true Write .network.value."bond0".STARTMODE "auto" true Write .network nil true -Read .target.stat "/usr/lib/systemd/system/network.service" nil Execute .target.bash_output "/bin/systemctl restart network.service" $["TERM":"raw"] $["exit":0, "stdout":"laptop.suse.cz"] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
