Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit yast2-network
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 08 Jun 2007 00:31:38 +0200
- Message-id: <20070607223138.E5994678183@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Jun 8 00:31:38 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-06-01 11:21:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-06-07 17:46:57.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jun 7 17:45:24 CEST 2007 - mzugec@xxxxxxx
+
+- use static keyword for ISA/pnp devices hardware filenames (#208854)
+- 2.15.41
+
+-------------------------------------------------------------------
+Wed Jun 6 16:31:35 CEST 2007 - mzugec@xxxxxxx
+
+- values proposal for hardware dialog
+- 2.15.40
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.39.tar.bz2
New:
----
yast2-network-2.15.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.sX1306/_old 2007-06-08 00:27:43.000000000 +0200
+++ /var/tmp/diff_new_pack.sX1306/_new 2007-06-08 00:27:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.39)
+# spec file for package yast2-network (Version 2.15.41)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.15.39
+Version: 2.15.41
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.39.tar.bz2
+Source0: yast2-network-2.15.41.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -53,7 +53,7 @@
Michal Svec <msvec@xxxxxxx>
%prep
-%setup -n yast2-network-2.15.39
+%setup -n yast2-network-2.15.41
%build
%{prefix}/bin/y2tool y2autoconf
@@ -109,6 +109,12 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog
+* Thu Jun 07 2007 - mzugec@xxxxxxx
+- use static keyword for ISA/pnp devices hardware filenames (#208854)
+- 2.15.41
+* Wed Jun 06 2007 - mzugec@xxxxxxx
+- values proposal for hardware dialog
+- 2.15.40
* Fri Jun 01 2007 - mzugec@xxxxxxx
- save_network.ycp moved from routines/ to clients/
- Detection.ycp renamed to NetHwDetection.ycp
++++++ yast2-network-2.15.39.tar.bz2 -> yast2-network-2.15.41.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/configure new/yast2-network-2.15.41/configure
--- old/yast2-network-2.15.39/configure 2007-06-01 11:17:39.000000000 +0200
+++ new/yast2-network-2.15.41/configure 2007-06-07 17:38:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-network 2.15.39.
+# Generated by GNU Autoconf 2.60 for yast2-network 2.15.40.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.39'
-PACKAGE_STRING='yast2-network 2.15.39'
+PACKAGE_VERSION='2.15.40'
+PACKAGE_STRING='yast2-network 2.15.40'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-network 2.15.39 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.40 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.39:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.40:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.39
+yast2-network configure 2.15.40
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-network $as_me 2.15.39, which was
+It was created by yast2-network $as_me 2.15.40, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.39'
+ VERSION='2.15.40'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.39"
+VERSION="2.15.40"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.15.39, which was
+This file was extended by yast2-network $as_me 2.15.40, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.39
+yast2-network config.status 2.15.40
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/configure.in new/yast2-network-2.15.41/configure.in
--- old/yast2-network-2.15.39/configure.in 2007-06-01 11:17:34.000000000 +0200
+++ new/yast2-network-2.15.41/configure.in 2007-06-07 17:38:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.39, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.40, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.39"
+VERSION="2.15.40"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/clients/save_network.ycp new/yast2-network-2.15.41/src/clients/save_network.ycp
--- old/yast2-network-2.15.39/src/clients/save_network.ycp 2007-06-01 11:14:10.000000000 +0200
+++ new/yast2-network-2.15.41/src/clients/save_network.ycp 2007-06-07 17:38:04.000000000 +0200
@@ -203,8 +203,15 @@
hwfile = sformat("static-0");
y2warning("vio bus type, using %1", hwfile);
} else {
- hwfile = sformat("bus-%1-%2", busname, busid);
+ // #208854 - include "static" string for ISA cards
+ if (busname=="isa")
+ {
+ hwfile = sformat("static-bus-%1-%2", busname, busid);
y2internal("will create hwcfg file %1", hwfile);
+ } else {
+ hwfile = sformat("bus-%1-%2", busname, busid);
+ y2internal("will create hwcfg file %1", hwfile);
+ }
}
} else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/dsl/dialogs.ycp new/yast2-network-2.15.41/src/dsl/dialogs.ycp
--- old/yast2-network-2.15.39/src/dsl/dialogs.ycp 2007-05-31 17:46:35.000000000 +0200
+++ new/yast2-network-2.15.41/src/dsl/dialogs.ycp 2007-06-06 16:35:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration dialogs for DSL
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: dialogs.ycp 38227 2007-05-31 15:46:34Z mzugec $
+ * $Id: dialogs.ycp 38321 2007-06-06 14:35:16Z mzugec $
*/
{
@@ -109,7 +109,6 @@
// define void UpdateInterfaces() {
list<string> items = getNetDeviceItems();
if(size(items)>0 && interface=="") interface=items[0]:"";
-y2internal("items %1", items);
/* FIXME Why is not the current interface added? */
if(false && /*interface != "" && */!contains(ifaces, interface)) ifaces = add(ifaces, interface);
@@ -138,7 +137,6 @@
// list<string> items = NetworkDevices::List("");
-// y2internal("network devices list %1", items);
/*
NetworkDevices::Read();
@@ -147,7 +145,6 @@
string connection_text = _("%1 - %2 (%3)");
*/
-y2internal("interface %1", interface);
/* DSL dialog contents */
term contents = `HBox(
`HSpacing(6),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/installation/inst_netprobe.ycp new/yast2-network-2.15.41/src/installation/inst_netprobe.ycp
--- old/yast2-network-2.15.39/src/installation/inst_netprobe.ycp 2006-12-11 13:20:51.000000000 +0100
+++ new/yast2-network-2.15.41/src/installation/inst_netprobe.ycp 2007-06-06 16:43:24.000000000 +0200
@@ -4,20 +4,20 @@
* Summary: Start the network detection
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: inst_netprobe.ycp 16021 2004-03-11 12:16:43Z msvec $
+ * $Id: inst_netprobe.ycp 38268 2007-06-04 13:32:04Z mzugec $
*/
{
textdomain "network";
-import "Detection";
+import "NetHwDetection";
y2milestone("----------------------------------------");
y2milestone("Lan netprobe module started");
y2milestone("Args: %1", WFM::Args());
-if(!Detection::running) Detection::Start();
+if(!NetHwDetection::running) NetHwDetection::Start();
y2milestone("Lan netprobe module finished");
y2milestone("----------------------------------------");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/lan/address.ycp new/yast2-network-2.15.41/src/lan/address.ycp
--- old/yast2-network-2.15.39/src/lan/address.ycp 2007-06-01 11:16:46.000000000 +0200
+++ new/yast2-network-2.15.41/src/lan/address.ycp 2007-06-07 17:46:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: address.ycp 38235 2007-06-01 09:16:46Z mzugec $
+ * $Id: address.ycp 38349 2007-06-07 15:46:23Z mzugec $
*/
{
@@ -615,7 +615,7 @@
- string drvtype = Lan::DriverType (settings["IFCFGTYPE"]:"");
+ string drvtype = DriverType (settings["IFCFGTYPE"]:"");
boolean is_ptp = drvtype == "ctc" || drvtype == "iucv";
// TODO: dynamic for dummy. or add dummy from outside?
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/lan/complex.ycp new/yast2-network-2.15.41/src/lan/complex.ycp
--- old/yast2-network-2.15.39/src/lan/complex.ycp 2007-05-29 09:04:15.000000000 +0200
+++ new/yast2-network-2.15.41/src/lan/complex.ycp 2007-06-06 16:35:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 38163 2007-05-29 07:04:15Z mzugec $
+ * $Id: complex.ycp 38321 2007-06-06 14:35:16Z mzugec $
*/
{
@@ -76,8 +76,7 @@
Lan::AbortFunction = ``{return PollAbort();};
boolean ret = Lan::Read (`cache);
- boolean xenbr = Lan::HaveXenBridge ();
- if (xenbr)
+ if ( Lan::HaveXenBridge() )
{
if (! Popup::ContinueCancel (
sformat (
@@ -263,6 +262,10 @@
else // configured
{
Lan::Edit(current);
+ foreach(map<string, any> row, o_items, {
+ if (row["id"]:"" == current && row["hw_num"]:-1 != -1) Lan::SelectHW(row["hw_num"]:-1);
+ });
+// Lan::SelectHW (1);
if (Lan::startmode == "managed")
{
// Continue-Cancel popup
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/lan/hardware.ycp new/yast2-network-2.15.41/src/lan/hardware.ycp
--- old/yast2-network-2.15.39/src/lan/hardware.ycp 2007-05-29 09:04:15.000000000 +0200
+++ new/yast2-network-2.15.41/src/lan/hardware.ycp 2007-06-07 17:46:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: hardware.ycp 38163 2007-05-29 07:04:15Z mzugec $
+ * $Id: hardware.ycp 38349 2007-06-07 15:46:23Z mzugec $
*/
{
@@ -20,6 +20,7 @@
import "Wizard";
include "network/summary.ycp";
+include "network/routines.ycp";
/**
* Manual network card configuration dialog
@@ -90,7 +91,7 @@
// #38213, remember device id when we switch back from pcmcia/usb
hardware["non_hotplug_device_id"] = hardware["device"]:"";
hardware["hwcfg"] = Lan::nm_name;
- if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old;
+ if (!hasAnyValue(Lan::nm_name) && hasAnyValue(Lan::nm_name_old)) hardware["hwcfg"]=Lan::nm_name_old;
// FIXME duplicated in address.ycp
hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ];
@@ -203,7 +204,7 @@
`HStretch()
);
- term contents = `CheckBoxFrame(`id(`enable_hwconfig), caption, hardware["hwcfg"]:"" != "",
+ term contents = `CheckBoxFrame(`id(`enable_hwcfg), caption, hardware["hwcfg"]:"" != "",
`HBox(
`HSpacing(2),
`VBox(
@@ -221,7 +222,7 @@
UI::ReplaceWidget(`hw_content, contents);
-if (Lan::nm_name=="" && Lan::nm_name_old!=nil) UI::ChangeWidget(`enable_hwconfig, `Value, false);
+if (!hasAnyValue(Lan::nm_name) && hasAnyValue(Lan::nm_name_old)) UI::ChangeWidget(`enable_hwcfg, `Value, false);
hardware["no_hotplug"] = hardware["hotplug"]:"" == "";
hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy";
UI::ChangeWidget(`id(`modul), `Enabled, hardware["no_hotplug_dummy"]:false);
@@ -382,7 +383,7 @@
UI::ChangeWidget(`id(`num), `Value, hardware["device"]:"");
if(Arch::s390 ()) {
- string drvtype = Lan::DriverType (hardware["type"]:"");
+ string drvtype = DriverType (hardware["type"]:"");
if (contains (["lcs", "qeth", "ctc"], drvtype))
hardware["modul"] = drvtype;
@@ -421,17 +422,13 @@
}
void storeHW (string key, map event) {
- if(!(boolean)UI::QueryWidget(`enable_hwconfig, `Value))
+ if(!(boolean)UI::QueryWidget(`enable_hwcfg, `Value))
{
-
-NetworkModules::DeleteM(Lan::nm_name);
-if(Lan::nm_name_old==nil) Lan::nm_name_old = Lan::nm_name;
-Lan::nm_name="";
-map<string, any> tmp_current=$[];
-foreach(string key, any value, NetworkDevices::Current, {
-if (key != "_nm_name") tmp_current[key]=value;
-});
-NetworkDevices::Current=tmp_current;
+ NetworkModules::DeleteM(Lan::nm_name);
+ if(size(Lan::nm_name_old)==0) Lan::nm_name_old = Lan::nm_name;
+ Lan::nm_name="";
+ NetworkDevices::Current["_nm_name"]="";
+ NetworkDevices::Commit();
} else {
if(UI::WidgetExists(`id(`hwcfg))) {
@@ -466,10 +463,10 @@
if(UI::WidgetExists(`id(`num))) {
string devic = (string) UI::QueryWidget(`id(`num), `Value);
}
- }
-
NetworkModules::Alias = (string) UI::QueryWidget(`id(`modul), `Value);
NetworkModules::Options = (string) UI::QueryWidget(`id(`options), `Value);
+ }
+
if(UI::WidgetExists(`id(`num)))
Lan::device = (string) UI::QueryWidget(`id(`num), `Value);
@@ -502,7 +499,7 @@
/* S/390 dialog caption */
string caption = _("S/390 Network Card Configuration");
- string drvtype = Lan::DriverType (Lan::type);
+ string drvtype = DriverType (Lan::type);
string helptext = "";
term contents = `Empty ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/lan/virtual.ycp new/yast2-network-2.15.41/src/lan/virtual.ycp
--- old/yast2-network-2.15.39/src/lan/virtual.ycp 2007-04-22 12:43:43.000000000 +0200
+++ new/yast2-network-2.15.41/src/lan/virtual.ycp 2007-06-06 16:35:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Multiple addresses dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: virtual.ycp 37643 2007-04-22 10:40:07Z mzugec $
+ * $Id: virtual.ycp 38321 2007-06-06 14:35:16Z mzugec $
*/
{
@@ -98,7 +98,6 @@
item = VirtualEditDialog(cur, item, []/*forbidden*/);
- y2internal("item=%1", item);
if(item != nil)
{
table_items = maplist(term e, table_items, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/modules/Lan.ycp new/yast2-network-2.15.41/src/modules/Lan.ycp
--- old/yast2-network-2.15.39/src/modules/Lan.ycp 2007-06-01 11:16:46.000000000 +0200
+++ new/yast2-network-2.15.41/src/modules/Lan.ycp 2007-06-07 17:46:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: Lan.ycp 38235 2007-06-01 09:16:46Z mzugec $
+ * $Id: Lan.ycp 38349 2007-06-07 15:46:23Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -292,6 +292,7 @@
*/
global list<string> getModulesFor(string busid, string default_module){
+ if (!hasAnyValue(busid)) return [];
string bus_id = substring(busid, findfirstof(busid, "0123456789"));
list<string> mods = [ default_module ];
foreach(map<string, any> mod_row, (list<map<string, any> >)Hardware, {
@@ -311,26 +312,6 @@
include "network/routines.ycp";
include "network/runtime.ycp";
-/**
- * For s390 hwinfo gives us a multitude of types but some are handled
- * the same, mostly acording to the driver which is used. So let's group
- * them under the name Driver Type.
- * @param type a type, as in Lan::type
- * @return driver type, like formerly type2 for s390
- */
-global define string DriverType (string type) {
- string drvtype = type;
- // handle HSI like qeth, S#40692#c15
- if (type == "hsi")
- drvtype = "qeth";
- // Should eth occur on s390?
- else if (type == "tr" || type == "eth")
- drvtype = "lcs";
- // N#82891
- else if (type == "escon" || type == "ficon")
- drvtype = "ctc";
- return drvtype;
-}
/**
* Lan::Read (`cache) will do nothing if initialized already.
@@ -717,19 +698,7 @@
string mac = hw["mac"]:"";
string busid = hw["busid"]:"";
- // name of hwcfg
- if(busid != nil && busid != "") {
- nm_name = "bus-" + hw["bus"]:"" + "-" + hw["busid"]:"";
- if(Arch::s390 ()) nm_name = type + "-" + nm_name;
- }
- else {
- // #suse42421 - don't write hwcfg-static for pcmcia cards (PC and CardBus)
- // #254753 - when busID not available, use static-x hwcfg filename
- if(Arch::s390 ()) {
- nm_name = NetworkModules::GetFreeName("static-");
- y2internal("No bus id info found, will use %1", nm_name);
- } else y2warning ("No bus id info found, skipping hwcfg: %1", hw);
- }
+ nm_name = createHwcfgName(hw);
// name of ifcfg
/* eth, tr, not on s390 (#38819) */
@@ -1868,7 +1837,7 @@
{
y2milestone ("hostname from dns");
// try to get hostname from the network
- string hnent = Detection::ResolveIP(ipaddr);
+ string hnent = NetHwDetection::ResolveIP(ipaddr);
//last resort - generate random hostname (#165269)
if (hnent == "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/routines/complex.ycp new/yast2-network-2.15.41/src/routines/complex.ycp
--- old/yast2-network-2.15.39/src/routines/complex.ycp 2007-06-01 11:16:46.000000000 +0200
+++ new/yast2-network-2.15.41/src/routines/complex.ycp 2007-06-06 16:35:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 38235 2007-06-01 09:16:46Z mzugec $
+ * $Id: complex.ycp 38321 2007-06-06 14:35:16Z mzugec $
*
*/
@@ -518,10 +518,12 @@
// summary description of STARTMODE=off
"off" : _("Will not be started at all")
];
+/*
list<string> models = [];
foreach(map<string, any>row, (list<map<string, any> >)SCR::Read (.probe.netcard), {
models=add(models, row["model"]:"");
});
+*/
maplist(string type, map devmap, Devs, {
maplist(string k, map v, (map<string,map>)devmap, {
@@ -581,12 +583,14 @@
, ip, v["NETMASK"]:""),
];
}
-if (size(v["_aliases"]:$[])>0 && !NetworkService::IsManaged()){
- foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) v["_aliases"]:$[], {
- string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:"");
- bullets = add(bullets, sformat("%1 (%2)", key, parameters) );
- });
-}
+
+ // build aliases overview
+ if (size(v["_aliases"]:$[])>0 && !NetworkService::IsManaged()){
+ foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) v["_aliases"]:$[], {
+ string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:"");
+ bullets = add(bullets, sformat("%1 (%2)", key, parameters) );
+ });
+ }
}
// build the "Bond Slaves" entry of rich box
@@ -603,21 +607,17 @@
string rich = descr;
rich = HTML::Bold ( rich ) + getConnMacBusDescription(v, Hardware) + HTML::List (bullets);
- item = `item(`id(dev), descr, ip, rich);
+ integer hw_id=-1;
+ boolean found=false;
+ foreach(map device, Hardware, {
+ hw_id=hw_id+1;
+ if (v["udi"]:(v["UDI"]:"")==device["udi"]:"") { found=true; break; }
+ });
+
+ item = `item(`id(dev), descr, ip, rich, (found) ? hw_id : -1);
}
overview = add(overview, item);
- /* aliases summary */
-/*
- map<string,map> aliasee = v["_aliases"]:$[];
- if(aliasee != $[])
- maplist(string aid, map amap, aliasee, {
- string adev = NetworkDevices::alias_name(type, k, aid);
- ip = DeviceProtocol(amap);
- item = `item(`id(adev), DeviceType(adev), adev, ip);
- overview = add(overview, item);
- });
-*/
});
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/routines/hardware.ycp new/yast2-network-2.15.41/src/routines/hardware.ycp
--- old/yast2-network-2.15.39/src/routines/hardware.ycp 2007-05-07 11:12:09.000000000 +0200
+++ new/yast2-network-2.15.41/src/routines/hardware.ycp 2007-06-07 17:46:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware routines
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: hardware.ycp 37845 2007-05-07 08:45:06Z mzugec $
+ * $Id: hardware.ycp 38349 2007-06-07 15:46:23Z mzugec $
*
* All hardware settings are stored in a global variable Hardware.
*
@@ -234,6 +234,7 @@
one["name"] = DeviceName(card);
one["type"] = controller;
one["udi"] = card["udi"]:"";
+ one["sysfs_id"] = card["sysfs_id"]:"";
one["requires"] = card["requires"]:[];
// Each card remembers its position in the list of _all_ cards.
// It is used when selecting the card from the list of _unconfigured_
@@ -470,5 +471,34 @@
return SelectHardwareMap (FindHardware (Hardware, which));
}
+
+import "NetworkModules";
+include "network/routines.ycp";
+
+string createHwcfgName(map hw){
+ string hwcfg_name = "";
+ // name of hwcfg
+ if(hasAnyValue(hw["busid"]:"")) {
+ // #208854 - include "static" string
+ if(issubstring(hw["sysfs_id"]:"", "pnp")){
+ hwcfg_name = "static-bus-" + hw["bus"]:"" + "-" + hw["busid"]:"";
+ }
+ else{
+ hwcfg_name = "bus-" + hw["bus"]:"" + "-" + hw["busid"]:"";
+ if(Arch::s390 ()) hwcfg_name = DriverType(type) + "-" + hwcfg_name;
+ }
+ }
+ else {
+ // #suse42421 - don't write hwcfg-static for pcmcia cards (PC and CardBus)
+ // #254753 - when busID not available, use static-x hwcfg filename
+ if(Arch::s390 ()) {
+ hwcfg_name = NetworkModules::GetFreeName("static-");
+ y2internal("No bus id info found, will use %1", hwcfg_name);
+ } else y2warning ("No bus id info found, skipping hwcfg: %1", hw);
+ }
+ return hwcfg_name;
+}
+
+
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/routines/routines.ycp new/yast2-network-2.15.41/src/routines/routines.ycp
--- old/yast2-network-2.15.39/src/routines/routines.ycp 2006-12-11 13:20:56.000000000 +0100
+++ new/yast2-network-2.15.41/src/routines/routines.ycp 2007-06-07 17:46:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: routines.ycp 26816 2006-01-05 10:29:57Z mvidner $
+ * $Id: routines.ycp 38349 2007-06-07 15:46:23Z mzugec $
*/
{
@@ -299,5 +299,33 @@
return `next;
}
+/**
+ * For s390 hwinfo gives us a multitude of types but some are handled
+ * the same, mostly acording to the driver which is used. So let's group
+ * them under the name Driver Type.
+ * @param type a type, as in Lan::type
+ * @return driver type, like formerly type2 for s390
+ */
+define string DriverType (string type) {
+ string drvtype = type;
+ // handle HSI like qeth, S#40692#c15
+ if (type == "hsi")
+ drvtype = "qeth";
+ // Should eth occur on s390?
+ else if (type == "tr" || type == "eth")
+ drvtype = "lcs";
+ // N#82891
+ else if (type == "escon" || type == "ficon")
+ drvtype = "ctc";
+ return drvtype;
+}
+
+boolean hasAnyValue(string value){
+ if (value==nil) return false;
+ if (size(value)==0) return false;
+ else return true;
+}
+
+
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/src/routines/widgets.ycp new/yast2-network-2.15.41/src/routines/widgets.ycp
--- old/yast2-network-2.15.39/src/routines/widgets.ycp 2007-05-31 17:46:35.000000000 +0200
+++ new/yast2-network-2.15.41/src/routines/widgets.ycp 2007-06-06 16:35:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: widgets.ycp 38227 2007-05-31 15:46:34Z mzugec $
+ * $Id: widgets.ycp 38321 2007-06-06 14:35:16Z mzugec $
*/
{
@@ -212,7 +212,6 @@
NetworkDevices::Read();
list<string> items = NetworkDevices::List("eth");
items = filter (string i, items, ``( i != "lo" ));
- y2internal("network devices list %1", items);
return items;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.39/VERSION new/yast2-network-2.15.41/VERSION
--- old/yast2-network-2.15.39/VERSION 2007-06-01 11:09:47.000000000 +0200
+++ new/yast2-network-2.15.41/VERSION 2007-06-07 17:45:21.000000000 +0200
@@ -1 +1 @@
-2.15.39
+2.15.41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |