Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2014-06-02 07:04:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-fcoe-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2014-05-17 21:46:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2014-06-02 07:04:28.000000000 +0200 @@ -1,0 +2,13 @@ +Tue May 27 10:07:50 CEST 2014 - [email protected] + +- Show driver and private flags for all interfaces (improve patch + for bnc #841170) +- 3.1.9 + +------------------------------------------------------------------- +Wed May 21 13:33:04 CEST 2014 - [email protected] + +- Start/enable services 'lldpad' and 'fcoe' in installed system +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-fcoe-client-3.1.7.tar.bz2 New: ---- yast2-fcoe-client-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.fd7leB/_old 2014-06-02 07:04:28.000000000 +0200 +++ /var/tmp/diff_new_pack.fd7leB/_new 2014-06-02 07:04:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-fcoe-client-3.1.7.tar.bz2 -> yast2-fcoe-client-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.7/package/yast2-fcoe-client.changes new/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.changes --- old/yast2-fcoe-client-3.1.7/package/yast2-fcoe-client.changes 2014-05-14 14:35:44.000000000 +0200 +++ new/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.changes 2014-05-28 11:21:18.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue May 27 10:07:50 CEST 2014 - [email protected] + +- Show driver and private flags for all interfaces (improve patch + for bnc #841170) +- 3.1.9 + +------------------------------------------------------------------- +Wed May 21 13:33:04 CEST 2014 - [email protected] + +- Start/enable services 'lldpad' and 'fcoe' in installed system +- 3.1.8 + +------------------------------------------------------------------- Wed May 14 14:23:31 CEST 2014 - [email protected] - Improve layout of services, configuration and edit dialog, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.7/package/yast2-fcoe-client.spec new/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.spec --- old/yast2-fcoe-client-3.1.7/package/yast2-fcoe-client.spec 2014-05-14 14:35:44.000000000 +0200 +++ new/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.spec 2014-05-28 11:21:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.7/src/include/fcoe-client/complex.rb new/yast2-fcoe-client-3.1.9/src/include/fcoe-client/complex.rb --- old/yast2-fcoe-client-3.1.7/src/include/fcoe-client/complex.rb 2014-05-14 14:35:44.000000000 +0200 +++ new/yast2-fcoe-client-3.1.9/src/include/fcoe-client/complex.rb 2014-05-28 11:21:18.000000000 +0200 @@ -58,9 +58,11 @@ if !Stage.initial if FcoeClient.fcoe_started && !FcoeClient.fcoemonSocketEnabled? FcoeClient.fcoemonSocketStop + Service.Stop("fcoe") end if FcoeClient.lldpad_started && !FcoeClient.lldpadSocketEnabled? FcoeClient.lldpadSocketStop + Service.Stop("lldpad") end end return true if !FcoeClient.Modified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.7/src/modules/FcoeClient.rb new/yast2-fcoe-client-3.1.9/src/modules/FcoeClient.rb --- old/yast2-fcoe-client-3.1.7/src/modules/FcoeClient.rb 2014-05-14 14:35:44.000000000 +0200 +++ new/yast2-fcoe-client-3.1.9/src/modules/FcoeClient.rb 2014-05-28 11:21:18.000000000 +0200 @@ -788,16 +788,22 @@ "Setting start of lldpad to %1", lldpad_start ) - + # enable/disable services and sockets as required if fcoe_start && lldpad_start lldpadSocketEnable # enable 'lldpad' first + Service.Enable("lldpad") fcoemonSocketEnable + Service.Enable("fcoe") elsif !fcoe_start && lldpad_start fcoemonSocketDisable + Service.Disable("fcoe") lldpadSocketEnable + Service.Enable("lldpad") elsif !fcoe_start && !lldpad_start fcoemonSocketDisable # disable 'fcoe' first + Service.Disable("fcoe") lldpadSocketDisable + Service.Disable("lldpad") end # fcoe_start && !lldpad_start isn't possible -> see complex.ycp StoreServicesDialog @@ -846,8 +852,8 @@ # SLES11 SP3: /etc/init.d/boot.fcoe, line 86 # (modprobe $SUPPORTED_DRIVERS > /dev/null 2>&1) # SUPPORTED_DRIVERS from /etc/fcoe/config - # SLES12: Service.Start in inst-sys runs commands from - # /usr/lib/systemd/system/fcoe.service + # SLES12: Service.Start in inst-sys uses '/bin/service_start' to run + # commands from /usr/lib/systemd/system/fcoe.service # (including modprobe) ret = true @@ -895,6 +901,17 @@ log.info("lldpad.socket is already active") end + if lldpadSocketActive? && (Service.Status("lldpad") != 0) + success = Service.Start("lldpad") + if success + log.info("lldpad service started") + else + log.error( "Cannot start lldpad service") + Report.Error(_("Cannot start lldpad service.")) + ret = false + end + end + if !fcoemonSocketActive? success = fcoemonSocketStart if success @@ -909,6 +926,17 @@ log.info("fcoemon.socket is already active") end + if fcoemonSocketActive? && (Service.Status("fcoe") != 0) + success = Service.Start("fcoe") + if success + log.info("fcoe service started") + else + log.error( "Cannot start fcoe service") + Report.Error(_("Cannot start fcoe service.")) + ret = false + end + end + ret end @@ -1014,6 +1042,25 @@ netcards.each do |card| device = card["dev_name"] || "" dcb_capable = DCBCapable(device) # DCB capable + flags_map = {} + + if card["fcoeoffload"] == nil + # it's about a flag which is not set at all + flags_map["fcoe_flag"] = _("not set") + else + # also about setting of a flag + flags_map["fcoe_flag"] = card["fcoeoffload"]?_("true"):_("false") + end + if card["iscsioffload"] == nil + flags_map["iscsi_flag"] = _("not set") + else + flags_map["iscsi_flag"] = card["iscsioffload"]?_("true"):_("false") + end + if card["storageonly"] == nil + flags_map["storage_only"] = _("not set") + else + flags_map["storage_only"] = card["storageonly"]?_("true"):_("false") + end if Ops.get(vlan_info, device, []).empty? # Interface down or FCoE not enabled on the switch - we can't do anything here. @@ -1023,11 +1070,12 @@ info_map = { "dcb_capable"=> dcb_capable, "dev_name" => device, # network card, e.g. eth3 + "driver" => card["driver"] || "", "mac_addr" => Ops.get_string(card, ["resource", "hwaddr", 0, "addr"], ""), # MAC address "device" => card["device"] || card["model"] || "", "fcoe_vlan" => fcoe_vlan_interface } - + info_map.merge!(flags_map) network_interfaces = network_interfaces << info_map else # add infos about card and VLAN interfaces @@ -1094,23 +1142,7 @@ "vlan_interface" => vlan["vlan"] || "", # VLAN interface, e.g. 200 "cfg_device" => status_map["cfg_device"] || "" # part of cfg-file name, e.g. eth3.200 } - if card["fcoeoffload"] == nil - # it's about a flag which is not set at all - info_map["fcoe_flag"] = _("not set") - else - # also about setting of a flag - info_map["fcoe_flag"] = card["fcoeoffload"]?_("true"):_("false") - end - if card["iscsioffload"] == nil - info_map["iscsi_flag"] = _("not set") - else - info_map["iscsi_flag"] = card["iscsioffload"]?_("true"):_("false") - end - if card["storageonly"] == nil - info_map["storage_only"] = _("not set") - else - info_map["storage_only"] = card["storageonly"]?_("true"):_("false") - end + info_map.merge!(flags_map) network_interfaces = network_interfaces << info_map end # do |vlan| end # else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
