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# 898620 : "Avoid writing out LLADDR=00:00:00:00:00:00" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-09-29 17:27:11.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-09-30 13:34:03.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 29 22:14:49 UTC 2014 - mfilka@suse.com
+
+- bnc#898620
+ - do not write LLADDR="00:00:00:00:00:00" into ifcfg in z/VM
+- 3.1.103
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-network
- at least 19 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old)
and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:44849 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-network-3.1.102.tar.bz2
New:
----
yast2-network-3.1.103.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.n9Opjb/_old 2014-09-30 15:19:38.000000000 +0200
+++ /var/tmp/diff_new_pack.n9Opjb/_new 2014-09-30 15:19:38.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.102
+Version: 3.1.103
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.1.102.tar.bz2 -> yast2-network-3.1.103.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.102/package/yast2-network.changes new/yast2-network-3.1.103/package/yast2-network.changes
--- old/yast2-network-3.1.102/package/yast2-network.changes 2014-09-29 17:11:34.000000000 +0200
+++ new/yast2-network-3.1.103/package/yast2-network.changes 2014-09-30 13:31:22.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Sep 29 22:14:49 UTC 2014 - mfilka@suse.com
+
+- bnc#898620
+ - do not write LLADDR="00:00:00:00:00:00" into ifcfg in z/VM
+- 3.1.103
+
+-------------------------------------------------------------------
Thu Sep 25 15:51:37 UTC 2014 - mfilka@suse.com
- bnc#897394, bnc#866250
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.102/package/yast2-network.spec new/yast2-network-3.1.103/package/yast2-network.spec
--- old/yast2-network-3.1.102/package/yast2-network.spec 2014-09-29 17:11:34.000000000 +0200
+++ new/yast2-network-3.1.103/package/yast2-network.spec 2014-09-30 13:31:22.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.102
+Version: 3.1.103
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.102/src/include/network/lan/s390.rb new/yast2-network-3.1.103/src/include/network/lan/s390.rb
--- old/yast2-network-3.1.102/src/include/network/lan/s390.rb 2014-09-29 17:11:35.000000000 +0200
+++ new/yast2-network-3.1.103/src/include/network/lan/s390.rb 2014-09-30 13:31:23.000000000 +0200
@@ -8,23 +8,18 @@
# Functions for accessing and handling s390 specific needs.
module Yast
module NetworkLanS390Include
- def initialize_network_lan_s390(include_target)
- Yast.import "UI"
+ SYS_DIR = "/sys/class/net"
+ def initialize_network_lan_s390(include_target)
Yast.import "FileUtils"
-
- Yast.include include_target, "network/routines.rb"
-
- @sys_dir = "/sys/class/net"
end
# Checks if driver was successfully loaded for particular device.
def s390_DriverLoaded(devname)
return false if !Arch.s390
+ return false if devname.empty?
- return false if IsEmpty(devname)
-
- FileUtils.IsDirectory(Builtins.sformat("%1/%2", @sys_dir, devname)) == true
+ FileUtils.IsDirectory("#{SYS_DIR}/#{devname}") == true
end
# Reads particular qeth attribute and returns its value as a string.
@@ -37,7 +32,7 @@
result = Convert.to_string(
SCR.Read(
path(".target.string"),
- Builtins.sformat("%1/%2/device/%3", @sys_dir, devname, attrib)
+ Builtins.sformat("%1/%2/device/%3", SYS_DIR, devname, attrib)
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.102/src/modules/LanItems.rb new/yast2-network-3.1.103/src/modules/LanItems.rb
--- old/yast2-network-3.1.102/src/modules/LanItems.rb 2014-09-29 17:11:35.000000000 +0200
+++ new/yast2-network-3.1.103/src/modules/LanItems.rb 2014-09-30 13:31:23.000000000 +0200
@@ -82,9 +82,6 @@
@description = ""
- #unique - only for backward compatibility
- #global string unique = "";
-
@type = ""
# ifcfg name for the @current device
@device = ""
@@ -204,7 +201,6 @@
# NetworkModules:: name
@nm_name = ""
- @nm_name_old = nil
#this is the map of kernel modules vs. requested firmware
#non-empty keys are firmware packages shipped by SUSE
@@ -246,7 +242,6 @@
"REMOTE_IPADDR" => "",
"NETMASK" => "",
"MTU" => "",
- "LLADDR" => "00:00:00:00:00:00",
"ETHTOOL_OPTIONS" => "",
"NAME" => "",
"STARTMODE" => "manual",
@@ -301,7 +296,8 @@
"QETH_LAYER2" => "no",
"QETH_CHANIDS" => "",
"IPA_TAKEOVER" => "no",
- "IUCV_USER" => ""
+ "IUCV_USER" => "",
+ "LLADDR" => "00:00:00:00:00:00"
}
# ifplugd sometimes does not work for wifi
@@ -1728,10 +1724,6 @@
@wl_power = d["WIRELESS_POWER"] == "yes"
@wl_ap_scanmode = d["WIRELESS_AP_SCANMODE"]
- # s/390 options
- # We always have to set the MAC Address for qeth Layer2 support
- @qeth_macaddress = d["LLADDR"]
-
@ipoib_mode = d["IPOIB_MODE"]
@aliases = Ops.get_map(devmap, "_aliases", {})
@@ -1752,6 +1744,14 @@
@qeth_layer2 = d["QETH_LAYER2"] == "yes"
@qeth_chanids = d["QETH_CHANIDS"]
+ # s/390 options
+ # We always have to set the MAC Address for qeth Layer2 support.
+ # It is used mainly as a hint for user that MAC is expected in case
+ # of Layer2 devices. Other devices do not need it. Simply
+ # because such devices do not emulate Layer2
+ @qeth_macaddress = d["LLADDR"] if @qeth_layer2
+
+
# qeth attribute. FIXME: currently not read from system.
@ipa_takeover = Ops.get_string(defaults, "IPA_TAKEOVER", "") == "yes"
@@ -1860,11 +1860,6 @@
end
Builtins.y2debug("type=%1", @type)
- # We always have to set the MAC Address for qeth Layer2 support
- if @qeth_layer2
- @qeth_macaddress = Ops.get_string(devmap, "LLADDR", "00:00:00:00:00:00")
- end
-
true
end
@@ -1918,13 +1913,14 @@
Ops.set(newdev, "REMOTE_IPADDR", @remoteip)
# set LLADDR to sysconfig only for device on layer2 and only these which needs it
- if @qeth_layer2
+ # do not write incorrect LLADDR.
+ if @qeth_layer2 && s390_correct_lladdr(@qeth_macaddress)
busid = Ops.get_string(@Items, [@current, "hwinfo", "busid"], "")
# sysfs id has changed from css0...
- sysfs_id = Ops.add("/devices/qeth/", busid)
- Builtins.y2milestone("busid %1", busid)
+ sysfs_id = "/devices/qeth/#{busid}"
+ log.info("busid #{busid}")
if s390_device_needs_persistent_mac(sysfs_id, @Hardware)
- Ops.set(newdev, "LLADDR", @qeth_macaddress)
+ newdev["LLADDR"] = @qeth_macaddress
end
end
@@ -2527,6 +2523,20 @@
publish :variable => name, :type => type
end
+ # Checks if given lladdr can be written into ifcfg
+ #
+ # @param lladdr [String] logical link address, usually MAC address in case
+ # of qeth device
+ # @return [true, false] check result
+ def s390_correct_lladdr(lladdr)
+ return false if !Arch.s390
+ return false if lladdr.nil?
+ return false if lladdr.empty?
+ return false if lladdr.strip == "00:00:00:00:00:00"
+
+ return true
+ end
+
public
# @attribute Items
@@ -2607,7 +2617,6 @@
publish_variable :proposal_valid , "boolean"
publish_variable :nm_proposal_valid , "boolean"
publish_variable :nm_name , "string"
- publish_variable :nm_name_old , "string"
# @attribute SysconfigDefaults
publish_variable :SysconfigDefaults , "map