[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12

4 Mar 2014

Script 'mail_helper' called by kukuk
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: kukuk.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12



## BNC# 866617 : "Build0134: wicked fails on first boot after installation" (NEEDINFO/)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes	2014-02-28 22:07:58.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes	2014-03-04 17:47:52.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Mar  4 16:24:22 UTC 2014 - mvidner@suse.com
+
+- Use wickedd-dhcp{6,4} instead of (dropped) dhcpcd-test when
+  setting up DHCP interfaces (bnc#866617)
+- 3.1.30
+
+-------------------------------------------------------------------

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:33827 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-network", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-network-3.1.29.tar.bz2

New:
----
  yast2-network-3.1.30.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.4nZb7I/_old	2014-03-04 18:04:09.000000000 +0100
+++ /var/tmp/diff_new_pack.4nZb7I/_new	2014-03-04 18:04:09.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.29
+Version:        3.1.30
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-network-3.1.29.tar.bz2 -> yast2-network-3.1.30.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.30/package/yast2-network.changes
--- old/yast2-network-3.1.29/package/yast2-network.changes	2014-02-28 17:05:03.000000000 +0100
+++ new/yast2-network-3.1.30/package/yast2-network.changes	2014-03-04 17:44:46.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Mar  4 16:24:22 UTC 2014 - mvidner@suse.com
+
+- 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 - jreidinger@suse.com
 
 - 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.30/package/yast2-network.spec
--- old/yast2-network-3.1.29/package/yast2-network.spec	2014-02-28 17:05:03.000000000 +0100
+++ new/yast2-network-3.1.30/package/yast2-network.spec	2014-03-04 17:44:46.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.29
+Version:        3.1.30
 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.30/src/clients/inst_setup_dhcp.rb
--- old/yast2-network-3.1.29/src/clients/inst_setup_dhcp.rb	2014-02-28 17:05:03.000000000 +0100
+++ new/yast2-network-3.1.30/src/clients/inst_setup_dhcp.rb	2014-03-04 17:44:46.000000000 +0100
@@ -6,6 +6,7 @@
   include Yast
 
   BASH_PATH = Path.new(".target.bash")
+  WICKED_BIN_DIR = "/usr/lib/wicked/bin"
 
   def self.network_cards
     LanItems.Read
@@ -36,8 +37,12 @@
     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
+  end
+
   def self.get_lease?(card)
-    SCR.Execute(BASH_PATH, "dhcpcd-test '#{card}'") == 0
+    get_lease_ipvx?(6, card) || get_lease_ipvx?(4, card)
   end
 
   def self.start_dhcp(card)
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.30/testsuite/tests/Network_YaPI.out
--- old/yast2-network-3.1.29/testsuite/tests/Network_YaPI.out	2014-02-28 17:05:03.000000000 +0100
+++ new/yast2-network-3.1.30/testsuite/tests/Network_YaPI.out	2014-03-04 17:44:46.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.30/testsuite/tests/YaPI_bond.out
--- old/yast2-network-3.1.29/testsuite/tests/YaPI_bond.out	2014-02-28 17:05:03.000000000 +0100
+++ new/yast2-network-3.1.30/testsuite/tests/YaPI_bond.out	2014-03-04 17:44:46.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"]

continue with "q"...


Checked in at Tue Mar 4 18:05:00 CET 2014 by kukuk

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

kukuk

tags

participants (1)