Hello community, here is the log from the commit of package yast2-network checked in at Mon Mar 10 18:44:04 CET 2008. -------- --- yast2-network/yast2-network.changes 2008-02-29 11:03:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-03-10 11:48:30.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 10 12:42:21 CET 2008 - mzugec@suse.de + +- allow using vlan also with bond and bridge devices (bnc#367093) +- 2.16.24 + +------------------------------------------------------------------- Old: ---- yast2-network-2.16.23.tar.bz2 New: ---- yast2-network-2.16.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.F26006/_old 2008-03-10 18:43:46.000000000 +0100 +++ /var/tmp/diff_new_pack.F26006/_new 2008-03-10 18:43:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.16.23) +# spec file for package yast2-network (Version 2.16.24) # # 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.23 +Version: 2.16.24 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.16.23.tar.bz2 +Source0: yast2-network-2.16.24.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -71,7 +71,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-network-2.16.23 +%setup -n yast2-network-2.16.24 %build %{prefix}/bin/y2tool y2autoconf @@ -135,6 +135,9 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Mon Mar 10 2008 mzugec@suse.de +- allow using vlan also with bond and bridge devices (bnc#367093) +- 2.16.24 * Tue Feb 26 2008 mzugec@suse.de - automatic refresh of selection list box (bnc#363423) - 2.16.23 ++++++ yast2-network-2.16.23.tar.bz2 -> yast2-network-2.16.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.23/configure new/yast2-network-2.16.24/configure --- old/yast2-network-2.16.23/configure 2008-02-26 18:17:39.000000000 +0100 +++ new/yast2-network-2.16.24/configure 2008-03-10 12:09:54.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.22. +# Generated by GNU Autoconf 2.61 for yast2-network 2.16.23. # # 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.22' -PACKAGE_STRING='yast2-network 2.16.22' +PACKAGE_VERSION='2.16.23' +PACKAGE_STRING='yast2-network 2.16.23' 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.22 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.16.23 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.22:";; + short | recursive ) echo "Configuration of yast2-network 2.16.23:";; 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.22 +yast2-network configure 2.16.23 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.22, which was +It was created by yast2-network $as_me 2.16.23, 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.22' + VERSION='2.16.23' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.22" +VERSION="2.16.23" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" @@ -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.22, which was +This file was extended by yast2-network $as_me 2.16.23, 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.22 +yast2-network config.status 2.16.23 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.23/configure.in new/yast2-network-2.16.24/configure.in --- old/yast2-network-2.16.23/configure.in 2008-02-26 18:17:30.000000000 +0100 +++ new/yast2-network-2.16.24/configure.in 2008-03-10 12:09:28.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.16.4 - DO NOT EDIT! -- +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.22, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.16.23, 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.22" +VERSION="2.16.23" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.23/src/lan/address.ycp new/yast2-network-2.16.24/src/lan/address.ycp --- old/yast2-network-2.16.23/src/lan/address.ycp 2008-02-18 15:10:34.000000000 +0100 +++ new/yast2-network-2.16.24/src/lan/address.ycp 2008-03-10 12:44:09.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: address.ycp 44396 2008-02-12 15:52:28Z msvec $ + * $Id: address.ycp 45325 2008-03-10 10:40:28Z mzugec $ */ { @@ -153,6 +153,9 @@ if (hasAnyValue(dev_name)) items = add(items, `item(`id(dev_name), sformat("%1 - %2", dev_name, description), (dev_name==settings["ETHERDEVICE"]:"")?true:false)); } }); + foreach (string dev_name, NetworkInterfaces::List("br|bond"), { + items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false)); + }); UI::ChangeWidget(`id(key), `Items, items); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.23/src/lan/hardware.ycp new/yast2-network-2.16.24/src/lan/hardware.ycp --- old/yast2-network-2.16.23/src/lan/hardware.ycp 2008-02-18 15:10:34.000000000 +0100 +++ new/yast2-network-2.16.24/src/lan/hardware.ycp 2008-03-10 11:56:41.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: hardware.ycp 44396 2008-02-12 15:52:28Z msvec $ + * $Id: hardware.ycp 45272 2008-03-06 16:10:04Z kmachalkova $ */ { @@ -25,29 +25,39 @@ * Manual network card configuration dialog * @return dialog result */ - /* Manual dialog help 1/4 */ - string hw_help = _("<p>Here, set up your networking device.</p> -") + - - /* Manual dialog help 2/4 */ -_("<p><b>Options</b> for the module should be written in the format -<i>option</i>=<i>value</i>. Each entry should be space separated, -for example, <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are configured -with the same module name, options will be merged while saving.</p>"); + /* Manual network card setup help 1/4 */ + string hw_help = _("<p>Here, set up hardware-specific options for +your network device.</p>") + + + /* Manual network card setup help 2/4 */ + /* translators: do not translated udev, MAC, BusID*/ +_("<p><b>Udev rules</b> are the rules for kernel device manager that allow +associating MAC address or BusID of the network device with its name (e.g +eth1, wlan0 ) and make device name persistent upon reboot. If you don't +know what udev and its rules is, you probably don't need to use this option") + + + /* Manual network card setup help 2/4 */ +_("<p><b>Kernel module</b>. Enter kernel module (in other words, driver) name +for your network device. If the device is already configured, you may select +one from the drop-down list if more than one driver for your device is +available. In most of the cases it is however OK to use the default value.</p>") + + + /* Manual networ card setup help 3/4 */ +_("<p>Additionally, you may specify <b>options</b> for the kernel module. They should +be written in the format <i>option</i>=<i>value</i>. Each entry should be space +separated,for example, <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are +configured with the same module name, options will be merged while saving.</p>"); if(!(LanItems::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true)) { - /* Manual dialog help 3/4 */ -hw_help = hw_help + _("<p>Get a list of available network cards by pressing -<b>Select from List</b>.</p>") + - /* Manual dialog help 4/4 */ -_("<p>If you have a <b>PCMCIA</b> network card, select PCMCIA. +hw_help = hw_help + _("<p>If you have a <b>PCMCIA</b> network card, select PCMCIA. If you have a <b>USB</b> network card, select USB.</p> "); - } - + + } + if(Arch::s390 ()) { // overwrite help @@ -61,6 +71,7 @@ in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>"); } + map<string, any> hardware = nil; boolean hw_standalone=false; @@ -412,6 +423,8 @@ `VBox( `RadioButtonGroup(`id(`udev_type), `VBox( + //make sure there is enough space (#367239) + `HSpacing(30), `Label(_("Rule by:")), `Left(`RadioButton(`id(`mac), sformat("MAC address : %1", LanItems::getCurrentItem()["hwinfo", "mac"]:""))), `Left(`RadioButton(`id(`busid), sformat("BusID : %1", LanItems::getCurrentItem()["hwinfo", "busid"]:"") )) @@ -706,7 +719,7 @@ "init" : initHwDialog, "handle" : handleHW, "store" : storeHW, - "help" : hw_help + "help" : hw_help ]]; any HardwareDialog (){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.23/VERSION new/yast2-network-2.16.24/VERSION --- old/yast2-network-2.16.23/VERSION 2008-02-26 18:18:52.000000000 +0100 +++ new/yast2-network-2.16.24/VERSION 2008-03-10 12:42:18.000000000 +0100 @@ -1 +1 @@ -2.16.23 +2.16.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org