Hello community, here is the log from the commit of package yast2-network checked in at Tue Jan 16 17:36:26 CET 2007. -------- --- yast2-network/yast2-network.changes 2007-01-12 10:31:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-01-16 13:44:37.164965000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 16 11:40:06 CET 2007 - kmachalkova@suse.cz + +- Avoid displaying empty strings in internet test dialog (#220813, + #223498) +- 2.15.9 + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.6.tar.bz2 New: ---- yast2-network-2.15.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.e28100/_old 2007-01-16 17:36:18.000000000 +0100 +++ /var/tmp/diff_new_pack.e28100/_new 2007-01-16 17:36:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.6) +# spec file for package yast2-network (Version 2.15.9) # # 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.6 -Release: 5 +Version: 2.15.9 +Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.6.tar.bz2 +Source0: yast2-network-2.15.9.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -28,7 +28,7 @@ # String::Random # Linuxrc::display_ip # NetworkDevices::FindFastest -Requires: yast2 >= 2.14.13 +Requires: yast2 >= 2.15.2 Requires: sysconfig yast2-country yast2-inetd yast2-packager PreReq: /bin/rm Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl @@ -51,7 +51,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-network-2.15.6 +%setup -n yast2-network-2.15.9 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +107,10 @@ /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %changelog -n yast2-network +* Tue Jan 16 2007 - kmachalkova@suse.cz +- Avoid displaying empty strings in internet test dialog (#220813, + [#223498]) +- 2.15.9 * Thu Jan 11 2007 - mzugec@suse.cz - #150207 - disable sysconfig.displaymanager.KDE_USE_IPV6 when disabling ipv6 * Tue Jan 09 2007 - mzugec@suse.cz ++++++ yast2-network-2.15.6.tar.bz2 -> yast2-network-2.15.9.tar.bz2 ++++++ ++++ 12666 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/configure.in new/yast2-network-2.15.9/configure.in --- old/yast2-network-2.15.6/configure.in 2007-01-05 16:29:52.000000000 +0100 +++ new/yast2-network-2.15.9/configure.in 2007-01-16 13:43:44.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- +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.5, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.15.9, 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.5" +VERSION="2.15.9" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/Makefile.am new/yast2-network-2.15.9/Makefile.am --- old/yast2-network-2.15.6/Makefile.am 2007-01-05 16:29:52.000000000 +0100 +++ new/yast2-network-2.15.9/Makefile.am 2007-01-16 13:43:45.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/Makefile.am.common new/yast2-network-2.15.9/Makefile.am.common --- old/yast2-network-2.15.6/Makefile.am.common 2007-01-05 16:29:52.000000000 +0100 +++ new/yast2-network-2.15.9/Makefile.am.common 2007-01-16 13:43:45.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/src/installation/dialogs.ycp new/yast2-network-2.15.9/src/installation/dialogs.ycp --- old/yast2-network-2.15.6/src/installation/dialogs.ycp 2006-10-20 15:04:11.000000000 +0200 +++ new/yast2-network-2.15.9/src/installation/dialogs.ycp 2007-01-16 13:37:54.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Arvin Schnell <arvin@suse.de> * - * $Id: dialogs.ycp 33494 2006-10-18 12:17:01Z kmachalkova $ + * $Id: dialogs.ycp 35386 2007-01-16 12:37:52Z kmachalkova $ */ { @@ -60,21 +60,30 @@ define map <string, string> GetDeviceDescription(string device_id) { string device_name = NetworkDevices::GetValue(device_id,"NAME"); + + if ( (device_name == nil) || (device_name == "") ) { + //TRANSLATORS: Informs that device name is not known + device_name = _("Unknown device"); + } //avoid too long device names if (size(device_name) > 30) { device_name = substring (device_name, 0, 27) + "..."; } + string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? + // TRANSLATORS: Informs that the IP address is assigned via DHCP + _("DHCP address") : + NetworkDevices::GetValue(device_id, "IPADDR")); + if ( (ip_addr == nil) || (ip_addr == "")) { + //TRANSLATORS: Informs that no IP has been assigned to the device + ip_addr = _("No IP address assigned"); + } + map <string, string> ret = $[ "type" : NetworkDevices::GetDeviceType(device_id), "name" : device_name, - "ipaddr" : (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? - // TRANSLATORS: Informs that the IP address is assigned via DHCP - _("DHCP address") - : - NetworkDevices::GetValue(device_id, "IPADDR") - ), + "ipaddr" : ip_addr, ]; return ret; @@ -212,7 +221,7 @@ { map <string, string> device_descr = GetDeviceDescription(via_device); Internet::SetDevice( via_device ); - UI::ReplaceWidget(`id(`rp), `RadioButton(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned")), Internet::do_test)); + UI::ReplaceWidget(`id(`rp), `RadioButton(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:""), Internet::do_test)); y2milestone("selected network device :%1", via_device); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/src/lan/address.ycp new/yast2-network-2.15.9/src/lan/address.ycp --- old/yast2-network-2.15.6/src/lan/address.ycp 2006-11-06 10:41:56.000000000 +0100 +++ new/yast2-network-2.15.9/src/lan/address.ycp 2007-01-16 11:39:52.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: address.ycp 34047 2006-11-06 09:41:51Z mzugec $ + * $Id: address.ycp 35163 2007-01-09 10:34:23Z mzugec $ */ { @@ -89,6 +89,25 @@ } /** + * Default function to init the value of slave devices box. + * @param key id of the widget + */ +void InitSlave(string key) +{ + UI::ChangeWidget(`id(key), `SelectedItems, settings["SLAVES"]:[]); +} + +/** + * Default function to store the value of slave devices box. + * @param key id of the widget + * @param key id of the widget + */ +void StoreSlave(string key, map event) +{ + settings["SLAVES"] = (list<string>)UI::QueryWidget (`id(key), `SelectedItems); +} + +/** * Initialize a RadioButtonGroup * Group called FOO has buttons FOO_bar FOO_qux and values bar qux * @param key id of the widget @@ -417,6 +436,26 @@ "handle": HandleIfcfg, ], + "BONDSLAVE": $[ + "widget": `multi_selection_box, + "label": _("Bond Slaves"), + "opt": [`shrinkable], + "items" : [ ], + "init": InitSlave, + "store": StoreSlave, + "help": _("<p>Select the salve devices for the bond device. Only the deveices which's Device Activation is Never and set as None Address Setup are available.</p>"), + ], + + "BONDOPTION": $[ + "widget": `combobox, + /* ComboBox label */ + "label": _("Bond Driver Options"), + "opt": [`hstretch, `editable], + "help": _("<p>Select the bond driver options, and edit it if you need. </p>"), + "items": [["mode=balance-rr"], ["mode=active-backup"], ["mode=balance-xor"], + ["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"], ["mode=balance-alb"]], + ], + "BOOTPROTO": $[ "widget": `empty, "help": "", @@ -425,6 +464,15 @@ "store": StoreWidgetRbg, ], + "BOOTPROTO_none": $[ + "widget": `radio_button, + // radio button label + "label": _("None Address Setup"), + "opt": [`notify], + "init": CWM::InitNull, + "store": CWM::StoreNull + ], + "BOOTPROTO_dhcp": $[ "widget": `radio_button, // radio button label @@ -435,6 +483,8 @@ "help": /* Address dialog help 2-6/8: dynamic address preferred */ /* Address dialog help 2/8 */ + _("<p>You can select none address setup if you don't want any IP address.</p>") + + _("<p>You can select dynamic address assignment if you have a <b>DHCP server</b> running on your local network.</p> ") + @@ -743,7 +793,7 @@ } // FIXME duplicated in hardware.ycp - list<string> device_types = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan" ]; + list<string> device_types = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; if(Arch::s390 ()) device_types = [ "eth", "tr", "hsi", "ctc", "escon", "iucv", "qeth", "lcs" ]; @@ -849,6 +899,7 @@ `id ("BOOTPROTO"), // CWM must not expand `id `MarginBox (1, 0, `VBox ( + `Left ("BOOTPROTO_none"), `Left ("BOOTPROTO_dhcp"), // TODO: widget attribute align: left `Left ("BOOTPROTO_static"), address_static_contents) @@ -861,12 +912,54 @@ is_ptp? address_p2p_contents: (no_dhcp? address_static_contents: address_dhcp_contents); - term address_contents = `HSquash(`VBox( - `Left(label), - just_address_contents, - frame2, - "_DIALOG" - )); + term bond = `MarginBox(1, 0, `Frame( "", `VBox("BONDSLAVE", "BONDOPTION"))); + + if (Lan::type == "bond") + { + settings["SLAVES"] = Lan::bond_slaves; + + //get all eth devices + map<string, map<string, map<string, any> > > devices = (map<string, map<string, map<string, any> > >)NetworkDevices::FilterDevices(""); + map<string, map<string, any> > avails= devices["eth"]:$[]; + + //filter the eth devices (BOOT_PROTO=none && START_MODE=off) + foreach (string num, map<string, any> value, avails, + { + if (((string)value["BOOTPROTO"]:"" == "none") && ((string)value["STARTMODE"]:"" == "off")) + wd["BONDSLAVE", "items"] = add (wd["BONDSLAVE", "items"]:[], [NetworkDevices::device_name("eth", num)] ); + }); + + settings["BONDOPTION"] = Lan::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]:"" != Lan::bond_option; + }); + wd["BONDOPTION", "items"] = prepend(wd["BONDOPTION", "items"]:[], [Lan::bond_option]); + } + + + term address_contents = nil; + if (Lan::type == "bond") + { + address_contents = `HSquash(`VBox( + `Left(label), + just_address_contents, + bond, + frame2, + "_DIALOG" + )); + } + else + { + address_contents = `HSquash(`VBox( + `Left(label), + just_address_contents, + frame2, + "_DIALOG" + )); + } map functions = $[ "init" : InitAddrWidget, @@ -965,6 +1058,12 @@ } } + if (Lan::type == "bond") + { + Lan::bond_option = settings["BONDOPTION"]:""; + Lan::bond_slaves = (list<string>)settings["SLAVES"]:[]; + } + // proceed with WLAN settings if appropriate, #42420 if (ret == `next && Lan::type == "wlan" && Lan::alias == "") { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/src/lan/hardware.ycp new/yast2-network-2.15.9/src/lan/hardware.ycp --- old/yast2-network-2.15.6/src/lan/hardware.ycp 2006-12-08 16:59:59.000000000 +0100 +++ new/yast2-network-2.15.9/src/lan/hardware.ycp 2007-01-16 11:39:52.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: hardware.ycp 34868 2006-12-08 15:59:06Z mzugec $ + * $Id: hardware.ycp 35163 2007-01-09 10:34:23Z mzugec $ */ { @@ -88,7 +88,7 @@ string hwcfg = Lan::nm_name; // FIXME duplicated in address.ycp - list<string> device_types = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan" ]; + list<string> device_types = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; if(Arch::s390 ()) device_types = [ "eth", "tr", "hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs" ]; @@ -347,6 +347,19 @@ UI::ChangeWidget(`id(`modul), `Value, modul); UI::ChangeWidget(`id(`options), `Value, options); } + else if (type == "bond") + { + UI::ChangeWidget(`id(`hwcfg), `Enabled, false); + UI::ChangeWidget(`id(`modul), `Enabled, false); + UI::ChangeWidget(`id(`options), `Enabled, false); + UI::ChangeWidget(`id(`pcmcia), `Enabled, false); + UI::ChangeWidget(`id(`usb), `Enabled, false); + UI::ChangeWidget(`id(`list), `Enabled, false); + + UI::ChangeWidget(`id(`hwcfg), `Value, ""); + UI::ChangeWidget(`id(`modul), `Value, ""); + UI::ChangeWidget(`id(`options), `Value, ""); + } continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/src/modules/Lan.ycp new/yast2-network-2.15.9/src/modules/Lan.ycp --- old/yast2-network-2.15.6/src/modules/Lan.ycp 2007-01-05 16:46:26.000000000 +0100 +++ new/yast2-network-2.15.9/src/modules/Lan.ycp 2007-01-16 11:39:52.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: Lan.ycp 35119 2007-01-05 15:46:22Z mzugec $ + * $Id: Lan.ycp 35214 2007-01-11 07:13:56Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -99,6 +99,10 @@ global list<string> wl_key = []; global integer wl_default_key = 0; global string wl_nick = ""; + +//bond options +global list<string> bond_slaves = []; +global string bond_option=""; /** * wl_wpa_eap aggregates the settings in a map for easier CWM access. * @struct wpa_eap @@ -444,7 +448,11 @@ void writeIPv6(){ if (ipv6){ SCR::Execute(.target.bash_output, "echo '#install ipv6 /bin/true' > /etc/modprobe.d/ipv6"); - } else SCR::Execute(.target.bash_output, "echo 'install ipv6 /bin/true' > /etc/modprobe.d/ipv6"); + SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, "yes"); + } else { + SCR::Execute(.target.bash_output, "echo 'install ipv6 /bin/true' > /etc/modprobe.d/ipv6"); + SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, "no"); + } } @@ -920,6 +928,8 @@ "WIRELESS_CA_CERT": "", "WIRELESS_EAP_AUTH": "", "WIRELESS_PEAP_VERSION": "", + + "BONDING_MODULE_OPTS": "", ]; string GetDeviceVar (map primary, map fallback, string key) { @@ -948,6 +958,15 @@ startmode = GetDeviceVar (devmap, defaults, "STARTMODE"); usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); + bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); + + bond_slaves=[]; + foreach(any key, any value, devmap, + { + if (regexpmatch((string)key, "BONDING_SLAVE[0-9]+")) + if ((string)value != nil) + bond_slaves = add(bond_slaves, (string)value); + }); /* wireless options */ wl_mode = GetDeviceVar (devmap, defaults, "WIRELESS_MODE"); @@ -1103,7 +1122,7 @@ qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; } - if(bootproto == "none") bootproto = "static"; + //if(bootproto == "none") bootproto = "static"; return true; } @@ -1262,6 +1281,29 @@ if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; + + if (type == "bond") + { + integer i = 0; + foreach (string slave, bond_slaves, + { + newdev[sformat("BONDING_SLAVE%1", i)] = slave; + i = i + 1; + }); + + //assign nil to rest BONDING_SLAVEn to remove them + while (i<10) + { + newdev[sformat("BONDING_SLAVE%1", i)] = nil; + i = i + 1; + }; + + newdev["BONDING_MODULE_OPTS"] = bond_option; + + //BONDING_MASTER always is yes + newdev["BONDING_MASTER"] = "yes"; + } + if(type == "wlan") { newdev["WIRELESS_MODE"] = wl_mode; newdev["WIRELESS_ESSID"] = wl_essid; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/src/routines/complex.ycp new/yast2-network-2.15.9/src/routines/complex.ycp --- old/yast2-network-2.15.6/src/routines/complex.ycp 2006-11-08 13:38:41.000000000 +0100 +++ new/yast2-network-2.15.9/src/routines/complex.ycp 2007-01-16 11:39:52.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Summary and overview functions * Authors: Michal Svec <msvec@suse.cz> * - * $Id: complex.ycp 34164 2006-11-08 12:38:39Z mzugec $ + * $Id: complex.ycp 35170 2007-01-09 12:22:40Z mzugec $ * */ @@ -295,6 +295,8 @@ "wlan-usb" : _("USB Wireless Network Card"), /* Device type label */ "xp" : _("XP Network"), + /* Device type label */ + "bond" : _("Bond Network"), ]; if(haskey(device_names, devtype)) @@ -411,7 +413,7 @@ string remip = devmap["REMOTE_IPADDR"]:""; if(addr == "" || addr == nil) /* Network card status */ - return sformat(_("Configured without an address")); + return HTML::Colorize (_("Warning: no encryption is used."), "red"); //sformat(_("Configured without an address")); else if(remip == "" || remip == nil) /* Network card status (%1 is address) */ return sformat(_("Configured with address %1"), @@ -549,6 +551,19 @@ , ip, v["NETMASK"]:""), ]; } + + // build the "Bond Slaves" entry of rich box + if (type == "bond") + { + string slaves = ""; + foreach (string key, any value, (map<string, any>)v, { + if ((value != nil) && (regexpmatch(key, "BONDING_SLAVE[0-9]"))) + slaves = slaves + ((slaves != "") ? ", " : "") + (string)value; + }); + if (slaves != "") + bullets = bullets + [_("Bond slaves")+ " : " + slaves]; + } + // create the rich text description string rich = HTML::Bold ( sformat("%1 %2", descr, (contains(models, v["NAME"]:"") )?"":_("(not connected)"))) +"<br>"+ HTML::List (bullets); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.6/VERSION new/yast2-network-2.15.9/VERSION --- old/yast2-network-2.15.6/VERSION 2007-01-05 16:45:19.000000000 +0100 +++ new/yast2-network-2.15.9/VERSION 2007-01-16 11:39:59.000000000 +0100 @@ -1 +1 @@ -2.15.6 +2.15.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org