Hello community,
here is the log from the commit of package yast2-network
checked in at Wed Mar 26 11:50:14 CET 2008.
--------
--- yast2-network/yast2-network.changes 2008-03-21 13:48:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-03-26 09:20:09.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Mar 25 18:15:16 CET 2008 - mzugec@suse.de
+
+- possibility to use unconfigured device for vlan, bond and bridge
+ (bnc#369195)
+- 2.16.28
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.16.27.tar.bz2
New:
----
yast2-network-2.16.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.J16589/_old 2008-03-26 11:50:05.000000000 +0100
+++ /var/tmp/diff_new_pack.J16589/_new 2008-03-26 11:50:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.16.27)
+# spec file for package yast2-network (Version 2.16.28)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-network
-Version: 2.16.27
+Version: 2.16.28
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.16.27.tar.bz2
+Source0: yast2-network-2.16.28.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -71,7 +71,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.16.27
+%setup -n yast2-network-2.16.28
%build
%{prefix}/bin/y2tool y2autoconf
@@ -135,6 +135,10 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Tue Mar 25 2008 mzugec@suse.de
+- possibility to use unconfigured device for vlan, bond and bridge
+ (bnc#369195)
+- 2.16.28
* Fri Mar 21 2008 mzugec@suse.de
- for alias elements use aliasX instead of X (bnc#369195)
- 2.16.27
++++++ yast2-network-2.16.27.tar.bz2 -> yast2-network-2.16.28.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/configure new/yast2-network-2.16.28/configure
--- old/yast2-network-2.16.27/configure 2008-03-21 13:32:43.000000000 +0100
+++ new/yast2-network-2.16.28/configure 2008-03-25 18:11:21.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-network 2.16.26.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.16.27.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.16.26'
-PACKAGE_STRING='yast2-network 2.16.26'
+PACKAGE_VERSION='2.16.27'
+PACKAGE_STRING='yast2-network 2.16.27'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.26 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.16.27 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.16.26:";;
+ short | recursive ) echo "Configuration of yast2-network 2.16.27:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.16.26
+yast2-network configure 2.16.27
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.26, which was
+It was created by yast2-network $as_me 2.16.27, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.16.26'
+ VERSION='2.16.27'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.26"
+VERSION="2.16.27"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,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.16.26, which was
+This file was extended by yast2-network $as_me 2.16.27, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.16.26
+yast2-network config.status 2.16.27
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/configure.in new/yast2-network-2.16.28/configure.in
--- old/yast2-network-2.16.27/configure.in 2008-03-21 13:32:36.000000000 +0100
+++ new/yast2-network-2.16.28/configure.in 2008-03-25 18:11:03.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.16.26, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.16.27, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.26"
+VERSION="2.16.27"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/src/lan/address.ycp new/yast2-network-2.16.28/src/lan/address.ycp
--- old/yast2-network-2.16.27/src/lan/address.ycp 2008-03-16 14:12:32.000000000 +0100
+++ new/yast2-network-2.16.28/src/lan/address.ycp 2008-03-25 18:24:42.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 45497 2008-03-16 13:12:33Z mzugec $
+ * $Id: address.ycp 45712 2008-03-26 08:11:15Z mzugec $
*/
{
@@ -32,11 +32,11 @@
import "Map";
include "network/summary.ycp";
-include "network/widgets.ycp";
include "network/lan/help.ycp";
include "network/lan/hardware.ycp";
include "network/lan/virtual.ycp";
include "network/complex.ycp";
+include "network/widgets.ycp";
include "network/lan/bridge.ycp";
/**
@@ -122,18 +122,13 @@
*/
void InitVLANSlave(string key)
{
- list items = [];
settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:"";
- foreach(integer row, any value, LanItems::Items,{
- LanItems::current = row;
- if (!LanItems::IsItemConfigured()){
- string dev_name = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
- string description = BuildDescription(LanItems::type, LanItems::device, $["dev_name":dev_name], [LanItems::getCurrentItem()["hwinfo"]:$[]]);
- if (hasAnyValue(dev_name)) items = add(items, `item(`id(dev_name), sformat("%1 - %2", dev_name, description), (dev_name==settings["ETHERDEVICE"]:"")?true:false));
- }
- });
+
+ list items = createUnconfigured([settings["ETHERDEVICE"]:""]);
+
foreach (string dev_name, NetworkInterfaces::List("br|bond"), {
- items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false));
+ items = add(items, `item(`id(dev_name), dev_name,
+ (dev_name==settings["ETHERDEVICE"]:"")?true:false));
});
UI::ChangeWidget(`id(key), `Items, items);
}
@@ -156,7 +151,21 @@
*/
void InitSlave(string key)
{
- UI::ChangeWidget(`id(key), `SelectedItems, settings["SLAVES"]:[]);
+// UI::ChangeWidget(`id(key), `SelectedItems, settings["SLAVES"]:[]);
+ list items = createUnconfigured(settings["SLAVES"]:[]);
+
+ map configurations = NetworkInterfaces::FilterDevices("netcard");
+ foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
+ foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), {
+
+ //filter the eth devices (BOOT_PROTO=none && START_MODE=off)
+ if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off"))
+ items = add (items, [ devname ] );
+
+ });
+ });
+
+ UI::ChangeWidget(`id(key), `Items, items);
}
/**
@@ -809,27 +818,18 @@
if (LanItems::type == "bond")
{
- settings["SLAVES"] = LanItems::bond_slaves;
-
- map configurations = NetworkInterfaces::FilterDevices("netcard");
- foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
- foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), {
-
- //filter the eth devices (BOOT_PROTO=none && START_MODE=off)
- if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off"))
- wd["BONDSLAVE", "items"] = add (wd["BONDSLAVE", "items"]:[], [ devname ] );
-
- });
- });
-
+ settings["SLAVES"] = LanItems::bond_slaves;
settings["BONDOPTION"] = LanItems::bond_option;
//fill up the drop list and make the default value first
+
wd["BONDOPTION", "items"] = filter(list<string> v, wd["BONDOPTION", "items"]:[],
{
return v[0]:"" != LanItems::bond_option;
});
wd["BONDOPTION", "items"] = prepend(wd["BONDOPTION", "items"]:[], [LanItems::bond_option]);
+
+
address_contents = `VBox(
`Left(label),
just_address_contents,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/src/lan/bridge.ycp new/yast2-network-2.16.28/src/lan/bridge.ycp
--- old/yast2-network-2.16.27/src/lan/bridge.ycp 2008-03-16 14:56:49.000000000 +0100
+++ new/yast2-network-2.16.28/src/lan/bridge.ycp 2008-03-25 16:36:51.000000000 +0100
@@ -16,10 +16,10 @@
*/
void InitBridge(string key)
{
- list items = [];
string old_name=NetworkInterfaces::Name;
// old values (preselected values)
list<string> br_ports = splitstring(NetworkInterfaces::Current["BRIDGE_PORTS"]:"", " ");
+ list items = createUnconfigured(br_ports);
// from all configured netcards filter 0.0.0.0 configurations
map configurations = NetworkInterfaces::FilterDevices("netcard");
foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
@@ -35,15 +35,6 @@
});
});
- // we can use also unconfigured devices
- foreach(integer row, any value, LanItems::Items,{
- LanItems::current = row;
- if (!LanItems::IsItemConfigured()){
- string dev_name = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
- string description = BuildDescription(LanItems::type, LanItems::device, $["dev_name":dev_name], [LanItems::getCurrentItem()["hwinfo"]:$[]]);
- if (hasAnyValue(dev_name)) items = add(items, `item(`id(dev_name), sformat("%1 - %2", dev_name, description), contains(br_ports, dev_name)));
- }
- });
NetworkInterfaces::Select(old_name);
UI::ChangeWidget(`id(key), `Items, items);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/src/routines/complex.ycp new/yast2-network-2.16.28/src/routines/complex.ycp
--- old/yast2-network-2.16.27/src/routines/complex.ycp 2008-01-17 15:23:49.000000000 +0100
+++ new/yast2-network-2.16.28/src/routines/complex.ycp 2008-03-25 18:24:42.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec
*
- * $Id: complex.ycp 43716 2008-01-17 14:23:48Z mzugec $
+ * $Id: complex.ycp 45712 2008-03-26 08:11:15Z mzugec $
*
*/
@@ -625,13 +625,5 @@
return BuildUnconfiguredCommon (sum[size(sum)-1]:[], class);
}
-
-
-
-
-
-
-
-
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/src/routines/widgets.ycp new/yast2-network-2.16.28/src/routines/widgets.ycp
--- old/yast2-network-2.16.27/src/routines/widgets.ycp 2007-12-14 17:40:25.000000000 +0100
+++ new/yast2-network-2.16.28/src/routines/widgets.ycp 2008-03-25 18:24:42.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner
*
- * $Id: widgets.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: widgets.ycp 45712 2008-03-26 08:11:15Z mzugec $
*/
{
@@ -18,6 +18,7 @@
import "IP";
import "NetworkPopup";
import "NetworkInterfaces";
+import "LanItems";
/**
* Validator for IP adresses, no_popup
@@ -269,5 +270,23 @@
return selected;
}
+define list createUnconfigured(list<string> match){
+ list items=[];
+ foreach(integer row, any value, LanItems::Items,{
+ LanItems::current = row;
+ if (!LanItems::IsItemConfigured()){
+ string dev_name = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
+ string description = BuildDescription(LanItems::type, LanItems::device, $["dev_name":dev_name], [LanItems::getCurrentItem()["hwinfo"]:$[]]);
+ if (hasAnyValue(dev_name)) items = add(items, `item(`id(dev_name), sformat("%1 - %2", dev_name, description), contains(match, dev_name)?true:false));
+ }
+ });
+ return items;
+}
+
+
+
+
+
+
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.27/VERSION new/yast2-network-2.16.28/VERSION
--- old/yast2-network-2.16.27/VERSION 2008-03-21 13:35:31.000000000 +0100
+++ new/yast2-network-2.16.28/VERSION 2008-03-25 18:15:13.000000000 +0100
@@ -1 +1 @@
-2.16.27
+2.16.28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org