Mailinglist Archive: yast-commit (265 mails)

< Previous Next >
[yast-commit] r67124 - in /trunk/network: ./ VERSION package/yast2-network.changes src/clients/save_network.ycp src/modules/Lan.ycp src/routines/routines.ycp
Author: mvidner
Date: Fri Jan 6 16:20:33 2012
New Revision: 67124

URL: http://svn.opensuse.org/viewcvs/yast?rev=67124&view=rev
Log:
- skip USB NICs during bridge proposal (bnc#710098)
- do not inherit for new bridge port devices PREFIXLEN (bnc#735109)
- do not inherit for bridge device ETHTOOLS_OPTIONS (bnc#735109)
- Filter out Chelsio devices without device file (bnc#711432)
- Only save LLADDR (persistent MAC) for some s390 card types
(bnc#658708).

svn merge -r66604:67123
http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/network

Modified:
trunk/network/ (props changed)
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/clients/save_network.ycp
trunk/network/src/modules/Lan.ycp
trunk/network/src/routines/routines.ycp

Modified: trunk/network/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67124&r1=67123&r2=67124&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Fri Jan 6 16:20:33 2012
@@ -1 +1 @@
-2.21.8
+2.22.0

Modified: trunk/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67124&r1=67123&r2=67124&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Fri Jan 6 16:20:33 2012
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Fri Jan 6 16:17:00 CET 2012 - mvidner@xxxxxxx
+
+- skip USB NICs during bridge proposal (bnc#710098)
+- do not inherit for new bridge port devices PREFIXLEN (bnc#735109)
+- do not inherit for bridge device ETHTOOLS_OPTIONS (bnc#735109)
+- Filter out Chelsio devices without device file (bnc#711432)
+- Only save LLADDR (persistent MAC) for some s390 card types
+ (bnc#658708).
+- 2.22.0
+
+-------------------------------------------------------------------
Fri Jan 6 14:47:16 CET 2012 - mvidner@xxxxxxx

- Moved NetworkStorage from yast2.rpm to yast2-network.rpm

Modified: trunk/network/src/clients/save_network.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=67124&r1=67123&r2=67124&view=diff
==============================================================================
--- trunk/network/src/clients/save_network.ycp (original)
+++ trunk/network/src/clients/save_network.ycp Fri Jan 6 16:20:33 2012
@@ -34,6 +34,10 @@
symbol network_disk = `no; // `nfs `iscsi `fcoe
string netdevice="";

+list<map> hardware=ReadHardware("netcard");
+y2milestone("hardware %1", hardware);
+
+
/**
* Read one install.inf item
* @param item InstallInf map key
@@ -59,6 +63,35 @@
return (ret == nil)? s: ret;
}

+string dev_name_to_sysfs_id(string dev_name) {
+ // hardware is global, read at client start
+ map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name ));
+ return hw_item["sysfs_id"]:"";
+}
+
+string sysfs_card_type(string device) {
+ string sysfs_id = dev_name_to_sysfs_id(device);
+ if (sysfs_id == "") return "none";
+ string filename = "/sys" + sysfs_id + "/card_type";
+ string card_type = (string) SCR::Read(.target.string, filename);
+ return String::FirstChunk(card_type, "\n");
+}
+
+boolean s390_device_needs_persistent_mac(string device) {
+ string card_type = sysfs_card_type(device);
+ list<string> types_needing_persistent = [
+ "OSD_100",
+ "OSD_1000",
+ "OSD_10GIG",
+ "OSD_FE_LANE",
+ "OSD_GbE_LANE",
+ "OSD_Express",
+ ];
+ boolean needs_persistent = contains(types_needing_persistent, card_type);
+ y2milestone("Device: %1, card type: %2, needs persistent MAC: %3", device,
card_type, needs_persistent);
+ return needs_persistent;
+}
+
/**
* Read install.inf from the correct location
* @return true on success
@@ -137,6 +170,10 @@

if (Arch::s390()) {
y2milestone ("Interface type: %1", InstallInf["type"]:"");
+ // only some card types need a persistent MAC (bnc#658708)
+ if (! s390_device_needs_persistent_mac(netdevice)) {
+ InstallInf = remove (InstallInf, "hwaddr");
+ }
// hsi devices do not support setting hwaddr (bnc #479481)
if (InstallInf["type"]:"" == "hsi" && haskey (InstallInf, "hwaddr"))
InstallInf = remove (InstallInf, "hwaddr");
@@ -218,11 +255,6 @@
return "";
}

-
-//map <string,any> hwcfg=$[];
-list<map> hardware=ReadHardware("netcard");
-y2milestone("hardware %1", hardware);
-
string StdoutOf(string command) {
map out = (map) SCR::Execute (.target.bash_output, command);
return out["stdout"]:"";

Modified: trunk/network/src/modules/Lan.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=67124&r1=67123&r2=67124&view=diff
==============================================================================
--- trunk/network/src/modules/Lan.ycp (original)
+++ trunk/network/src/modules/Lan.ycp Fri Jan 6 16:20:33 2012
@@ -845,6 +845,12 @@
if(size(slave)>0) skipped=add(skipped, slave);
});
}
+ // Skip also usb device as it is not good for bridge proposal
(bnc#710098)
+ if (NetworkInterfaces::GetType(ifcfg)=="usb"){
+ NetworkInterfaces::Edit(ifcfg);
+ y2milestone("Usb device %1 skipped from bridge proposal",
ifcfg);
+ skipped=add(skipped, ifcfg);
+ }
if (NetworkInterfaces::GetValue(ifcfg, "STARTMODE")=="nfsroot"){
y2milestone("Skipped %1 interface from bridge slaves because
of nfsroot.", ifcfg);
skipped=add(skipped, ifcfg);
@@ -906,6 +912,8 @@
NetworkInterfaces::Current["STARTMODE"]="auto";
// remove description - will be replaced by new (real) one
NetworkInterfaces::Current=remove(NetworkInterfaces::Current,
"NAME");
+ // remove ETHTOOLS_OPTIONS as it is useful only for real
hardware
+ NetworkInterfaces::Current=remove(NetworkInterfaces::Current,
"ETHTOOLS_OPTIONS");
if( NetworkInterfaces::Commit() ){
NetworkInterfaces::Add();
NetworkInterfaces::Edit(ifcfg);
@@ -915,6 +923,8 @@
foreach (string a, any v, (map <string,
any>)NetworkInterfaces::Current["_aliases"]:$[], {
if (v != nil) { NetworkInterfaces::DeleteAlias
(NetworkInterfaces::Name, a); }
});
+ //take out PREFIXLEN from old configuration (BNC#735109)
+ old_config["PREFIXLEN"]="";
old_config["_aliases"]=$[];
y2milestone("Old Config with apllied changes %1\n%2",
ifcfg, old_config);
NetworkInterfaces::Current = old_config;

Modified: trunk/network/src/routines/routines.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=67124&r1=67123&r2=67124&view=diff
==============================================================================
--- trunk/network/src/routines/routines.ycp (original)
+++ trunk/network/src/routines/routines.ycp Fri Jan 6 16:20:33 2012
@@ -750,6 +750,11 @@
card_ok=false;
y2milestone("Filtering out virtio device without device file.");
}
+ // filter out device with chelsio Driver and no Device File (bnc#711432)
+ if (one["module"]:""=="cxgb4" && one["dev_name"]:""==""){
+ card_ok=false;
+ y2milestone("Filtering out Chelsio device without device file.");
+ }
// exception to filter out uicv devices (bnc#585363)
if (card["device"]:""=="IUCV" && card["sysfs_bus_id"]:""!="netiucv"){
card_ok=false;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages