Hello community,
here is the log from the commit of package yast2-network
checked in at Thu Oct 9 12:15:29 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-10-06 15:01:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-10-09 10:39:09.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 9 10:21:52 CEST 2008 - mzugec@suse.de
+
+- for s390 devices added AY read/write support (fate#304938)
+- 2.17.38
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.17.37.tar.bz2
New:
----
yast2-network-2.17.38.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.x19598/_old 2008-10-09 12:15:12.000000000 +0200
+++ /var/tmp/diff_new_pack.x19598/_new 2008-10-09 12:15:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.17.37)
+# spec file for package yast2-network (Version 2.17.38)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.17.37
+Version: 2.17.38
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.17.37.tar.bz2
+Source0: yast2-network-2.17.38.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -79,7 +79,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.17.37
+%setup -n yast2-network-2.17.38
%build
%{prefix}/bin/y2tool y2autoconf
@@ -143,6 +143,9 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Thu Oct 09 2008 mzugec@suse.de
+- for s390 devices added AY read/write support (fate#304938)
+- 2.17.38
* Mon Oct 06 2008 mzugec@suse.de
- added support for HSI (s390) devices (fate#304938)
- 2.17.37
++++++ yast2-network-2.17.37.tar.bz2 -> yast2-network-2.17.38.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.37/src/clients/lan_auto.ycp new/yast2-network-2.17.38/src/clients/lan_auto.ycp
--- old/yast2-network-2.17.37/src/clients/lan_auto.ycp 2008-09-09 15:30:35.000000000 +0200
+++ new/yast2-network-2.17.38/src/clients/lan_auto.ycp 2008-10-09 10:24:45.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec
*
- * $Id: lan_auto.ycp 50530 2008-09-01 14:40:41Z kmachalkova $
+ * $Id: lan_auto.ycp 51997 2008-10-09 08:24:44Z mzugec $
*/
{
@@ -218,6 +218,16 @@
// Modules
+ list s390_devices=[];
+ foreach(string device, map mod, settings["s390-devices"]:$[], {
+ s390_devices=add(s390_devices, mod);
+ });
+
+ list net_udev=[];
+ foreach(string device, map mod, settings["net-udev"]:$[], {
+ net_udev=add(net_udev, mod);
+ });
+
list modules = [];
foreach(string device, map mod, settings["hwcfg"]:$[], {
map newmap = $[];
@@ -253,6 +263,10 @@
ret["routing"] = settings["routing"]:$[];
if (size(interfaces) > 0 )
ret["interfaces"] = interfaces;
+ if (size(s390_devices) > 0 )
+ ret["s390-devices"] = s390_devices;
+ if (size(net_udev) > 0 )
+ ret["net-udev"] = net_udev;
return (ret);
}
@@ -271,7 +285,6 @@
}
else if(func == "Import") {
map new = FromAY(param);
-y2internal("AY new %1", new);
Lan::Import(new);
ret = true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.37/src/clients/save_network.ycp new/yast2-network-2.17.38/src/clients/save_network.ycp
--- old/yast2-network-2.17.37/src/clients/save_network.ycp 2008-10-01 15:50:25.000000000 +0200
+++ new/yast2-network-2.17.38/src/clients/save_network.ycp 2008-10-07 07:16:02.000000000 +0200
@@ -23,6 +23,7 @@
import "String";
import "Mode";
import "Arch";
+import "LanUdevAuto";
include "network/routines.ycp";
include "network/complex.ycp";
@@ -428,7 +429,6 @@
WFM::SCRClose (new_SCR);
if (Mode::autoinst()){
- import "LanUdevAuto";
LanUdevAuto::Write();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.37/src/config/networking.rnc new/yast2-network-2.17.38/src/config/networking.rnc
--- old/yast2-network-2.17.37/src/config/networking.rnc 2008-09-09 15:30:35.000000000 +0200
+++ new/yast2-network-2.17.38/src/config/networking.rnc 2008-10-07 08:03:00.000000000 +0200
@@ -70,6 +70,36 @@
dhclient_set_down_link?
}
+
+s390-devices =
+ element device {
+ LIST,
+ device+
+ }
+
+device =
+ element device {
+ element type { text }? &
+ element chanids { text }? &
+ element portname { text }? &
+ element protocol { text }? &
+ element router { text }? &
+ }
+
+
+net-udev =
+ element rule {
+ LIST,
+ rule+
+ }
+
+rule =
+ element rule {
+ element rule { text }? &
+ element value { text }? &
+ element name { text }? &
+ }
+
remote_ipaddr = element remote_ipaddr { text }
bootproto = element bootproto { text }
broadcast = element broadcast { text }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.37/src/modules/LanUdevAuto.ycp new/yast2-network-2.17.38/src/modules/LanUdevAuto.ycp
--- old/yast2-network-2.17.37/src/modules/LanUdevAuto.ycp 2008-08-12 13:42:03.000000000 +0200
+++ new/yast2-network-2.17.38/src/modules/LanUdevAuto.ycp 2008-10-07 08:55:27.000000000 +0200
@@ -11,11 +11,13 @@
{
module "LanUdevAuto";
+ import "LanItems";
include "network/routines.ycp";
textdomain "network";
list<map> udev_rules=[];
+ list<map> s390_devices=[];
list <map> hardware=nil;
global string getDeviceName(string oldname){
@@ -93,10 +95,13 @@
}
global define boolean Import(map settings) {
+y2milestone("importing %1", settings);
if (oldStyle(settings)) settings["interfaces"] = createUdevFromIfaceName(settings["interfaces"]:[]);
else udev_rules = settings["net-udev"]:[];
+/* if (Arch::s390())*/ s390_devices=settings["s390-devices"]:[];
y2internal("interfaces: %1", settings["interfaces"]:[]);
- y2internal("udev rules:%1", udev_rules);
+ y2internal("net-udev rules:%1", udev_rules);
+ y2internal("s390-devices rules:%1", s390_devices);
return true;
}
@@ -116,8 +121,87 @@
SCR::Write(.udev_persistent.rules, rules);
} else
y2milestone("No udev rules defined by AY, nothing to write (keep original file)");
+ if (Arch::s390()){
+ foreach(map rule, s390_devices, {
+ LanItems::Select("");
+ LanItems::type=rule["type"]:"";
+ LanItems::qeth_chanids=rule["chanids"]:"";
+ switch(rule["type"]:""){
+ case "qeth":
+ LanItems::chan_mode=rule["portname"]:"";
+ break;
+ case "ctc":
+ LanItems::chan_mode=rule["protocol"]:"";
+ break;
+ case "iucv":
+ LanItems::chan_mode=rule["router"]:"";
+ break;
+ }
+ LanItems::createS390Device();
+ y2internal("rule %1", rule);
+ });
+ y2internal("Writing s390 rules %1", s390_devices);
+ }
return true;
}
+global map Export(map devices){
+ map AY=$["s390-devices":$[], "net-udev":$[]];
+ if (Arch::s390()){
+ list<string> devs=[];
+ foreach(string type, any value, (map)devices, {
+ devs = (list<string>)union((list)devs, Map::Keys((map)value));
+ });
+ foreach(string device, devs, {
+ map driver=(map)SCR::Execute(.target.bash_output, sformat("driver=$(ls -l /sys/class/net/%1/device/driver);echo ${driver##*/}|tr -d '\n'", device));
+ string device_type="";
+ string chanids="";
+ string portname="";
+ string protocol="";
+ if(driver["exit"]:-1==0){
+ switch(driver["stdout"]:""){
+ case "qeth":
+ device_type=driver["stdout"]:"";
+ break;
+ case "ctcm":
+ device_type="ctc";
+ break;
+ case "netiucv":
+ device_type="iucv";
+ break;
+ default:
+ y2error("unknown driver type :%1", driver["stdout"]:"");
+ }
+ } else{
+ y2error("%1", driver);
+ continue;
+ }
+ map chan_ids=(map)SCR::Execute(.target.bash_output,
+ sformat("for i in $(seq 0 2);do chanid=$(ls -l /sys/class/net/%1/device/cdev$i);echo ${chanid##*/};done|tr '\n' ' '", device));
+ if (size(chan_ids["stdout"]:"")>0) chanids=String::CutBlanks(chan_ids["stdout"]:"");
+ map port_name=(map)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/device/portname|tr -d '\n'", device));
+ if (size(port_name["stdout"]:"")>0) portname=String::CutBlanks(port_name["stdout"]:"");
+ map proto=(map)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/device/protocol|tr -d '\n'", device));
+ if (size(proto["stdout"]:"")>0) protocol=String::CutBlanks(proto["stdout"]:"");
+
+ AY["s390-devices", device]=$["type":device_type];
+ if (size(chanids)>0) AY["s390-devices", device, "chanids"]=chanids;
+// if (size(portname)>0) AY[device, "portname"]=portname;
+ if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol;
+
+ map port0 = (map)SCR::Execute(.target.bash_output, sformat("port0=$(ls -l /sys/class/net/%1/device/cdev0);echo ${port0##*/}|tr -d '\n'", device));
+y2internal("port0 %1", port0);
+ if (size(port0["stdout"]:"")>0){
+ string value = port0["stdout"]:"";
+ AY["net-udev", device]=$["rule" : "KERNELS",
+ "name" : device,
+ "value" : value
+ ];
+ }
+ });
+ }
+ y2internal("AY profile %1", AY);
+ return AY;
+}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.37/src/modules/Lan.ycp new/yast2-network-2.17.38/src/modules/Lan.ycp
--- old/yast2-network-2.17.37/src/modules/Lan.ycp 2008-10-02 16:11:52.000000000 +0200
+++ new/yast2-network-2.17.38/src/modules/Lan.ycp 2008-10-09 10:24:45.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 51805 2008-10-02 19:21:13Z mzugec $
+ * $Id: Lan.ycp 51997 2008-10-09 08:24:44Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -41,6 +41,7 @@
import "ModuleLoading";
import "Linuxrc";
import "Stage";
+import "LanUdevAuto";
include "network/complex.ycp";
include "network/runtime.ycp";
@@ -536,11 +537,15 @@
* @return dumped settings (later acceptable by Import())
*/
global define map Export() {
+ map devices = NetworkInterfaces::Export("netcard");
+ map udev_rules = LanUdevAuto::Export(devices);
return $[
"dns" : DNS::Export(),
// FIXME: MOD "modules" : Modules,
+ "s390-devices" : udev_rules["s390-devices"]:$[],
+ "net-udev" : udev_rules["net-udev"]:$[],
"config" : NetworkConfig::Export(),
- "devices" : NetworkInterfaces::Export("netcard"),
+ "devices" : devices,
// "hwcfg" : NetworkModules::Export("netcard"),
"routing" : Routing::Export(),
"managed" : NetworkService::IsManaged (),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.37/VERSION new/yast2-network-2.17.38/VERSION
--- old/yast2-network-2.17.37/VERSION 2008-10-02 17:16:30.000000000 +0200
+++ new/yast2-network-2.17.38/VERSION 2008-10-09 10:21:50.000000000 +0200
@@ -1 +1 @@
-2.17.37
+2.17.38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org