Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Dec 8 17:48:17 CET 2006.
--------
--- yast2-network/yast2-network.changes 2006-12-06 16:43:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2006-12-08 17:32:50.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 8 17:28:53 CET 2006 - mzugec@suse.cz
+
+- #116211 - use combobox for module drivers instead of textedit
+- 2.15.2
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.1.tar.bz2
New:
----
yast2-network-2.15.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.RG4Bdl/_old 2006-12-08 17:48:00.000000000 +0100
+++ /var/tmp/diff_new_pack.RG4Bdl/_new 2006-12-08 17:48:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.1)
+# spec file for package yast2-network (Version 2.15.2)
#
# Copyright (c) 2006 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.1
+Version: 2.15.2
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.1.tar.bz2
+Source0: yast2-network-2.15.2.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -51,7 +51,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.1
+%setup -n yast2-network-2.15.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,9 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog -n yast2-network
+* Fri Dec 08 2006 - mzugec@suse.cz
+- #116211 - use combobox for module drivers instead of textedit
+- 2.15.2
* Wed Dec 06 2006 - mzugec@suse.cz
- #226408 - Network card -> IPv6 configuration: cannot go back
- 2.15.1
++++++ yast2-network-2.15.1.tar.bz2 -> yast2-network-2.15.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.1/VERSION new/yast2-network-2.15.2/VERSION
--- old/yast2-network-2.15.1/VERSION 2006-12-06 16:38:31.000000000 +0100
+++ new/yast2-network-2.15.2/VERSION 2006-12-08 17:23:09.000000000 +0100
@@ -1 +1 @@
-2.15.1
+2.15.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.1/configure new/yast2-network-2.15.2/configure
--- old/yast2-network-2.15.1/configure 2006-12-06 16:16:24.000000000 +0100
+++ new/yast2-network-2.15.2/configure 2006-12-08 17:09:44.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-network 2.15.0.
+# Generated by GNU Autoconf 2.59 for yast2-network 2.15.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.0'
-PACKAGE_STRING='yast2-network 2.15.0'
+PACKAGE_VERSION='2.15.1'
+PACKAGE_STRING='yast2-network 2.15.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.0 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.0:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.1:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.0
+yast2-network configure 2.15.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.0, which was
+It was created by yast2-network $as_me 2.15.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.0'
+ VERSION='2.15.1'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.15.0"
+VERSION="2.15.1"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-network $as_me 2.15.0, which was
+This file was extended by yast2-network $as_me 2.15.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.0
+yast2-network config.status 2.15.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.1/configure.in new/yast2-network-2.15.2/configure.in
--- old/yast2-network-2.15.1/configure.in 2006-12-06 16:16:12.000000000 +0100
+++ new/yast2-network-2.15.2/configure.in 2006-12-08 17:09:38.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.0, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.1, 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.0"
+VERSION="2.15.1"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.1/src/lan/hardware.ycp new/yast2-network-2.15.2/src/lan/hardware.ycp
--- old/yast2-network-2.15.1/src/lan/hardware.ycp 2006-10-20 15:04:15.000000000 +0200
+++ new/yast2-network-2.15.2/src/lan/hardware.ycp 2006-12-08 16:59:59.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec
*
- * $Id: hardware.ycp 33495 2006-10-18 13:01:31Z kmachalkova $
+ * $Id: hardware.ycp 34868 2006-12-08 15:59:06Z mzugec $
*/
{
@@ -71,9 +71,9 @@
string modul = NetworkModules::Alias; // FIXME: MOD Lan::Module["module"]:"";
string options = NetworkModules::Options; // FIXME: MOD Lan::Module["options"]:"";
-
string hotplug = Lan::hotplug;
y2milestone("hotplug=%1", Lan::hotplug);
+ list<string> modules_from_hwinfo = Lan::getModulesFor(Lan::nm_name, modul );
string type = Lan::type;
if(type == "") {
@@ -128,6 +128,7 @@
if(Lan::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true)
CheckBoxes = `VSpacing(0);
+ // #116211 - allow user to change modules from list
/* Frame label */
term KernelBox = `Frame(_("&Kernel Module"), `HBox(`HSpacing(0.5), `VBox(
`VSpacing(0.4),
@@ -135,7 +136,7 @@
`TextEntry(`id(`hwcfg), _("&Hardware Configuration Name"), hwcfg),
`HBox(
/* Text entry label */
- `TextEntry(`id(`modul), _("&Module Name"), modul),
+ `ComboBox(`id(`modul), `opt(`editable), _("&Module Name"), modules_from_hwinfo),
`HSpacing(0.2),
`TextEntry(`id(`options), Label::Options (), options)
),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.1/src/modules/Lan.ycp new/yast2-network-2.15.2/src/modules/Lan.ycp
--- old/yast2-network-2.15.1/src/modules/Lan.ycp 2006-12-06 15:08:59.000000000 +0100
+++ new/yast2-network-2.15.2/src/modules/Lan.ycp 2006-12-08 16:59:59.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 34800 2006-12-06 14:08:57Z mzugec $
+ * $Id: Lan.ycp 34868 2006-12-08 15:59:06Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -37,6 +37,7 @@
import "Summary";
import "SuSEFirewall4Network";
import "FileUtils";
+import "PackageSystem";
include "network/complex.ycp";
include "network/runtime.ycp";
@@ -199,6 +200,8 @@
global symbol operation = nil;
// FIXME: used in lan/address.ycp (#17346) -> "global"
+
+
/*------------------*/
/* GLOBAL FUNCTIONS */
@@ -211,6 +214,26 @@
return modified;
}
+/*
+ * return list of available modules for device identified by busid
+ * with default default_module (on first possition)
+ */
+
+global list<string> getModulesFor(string busid, string default_module){
+ string bus_id = substring(busid, findfirstof(busid, "0123456789"));
+ list<string> mods = [ default_module ];
+ foreach(map mod_row, (list