Hello community, here is the log from the commit of package yast2-network checked in at Tue Aug 1 17:03:41 CEST 2006. -------- --- yast2-network/yast2-network.changes 2006-06-09 11:11:54.000000000 +0200 +++ yast2-network/yast2-network.changes 2006-08-01 11:21:09.000000000 +0200 @@ -1,0 +2,28 @@ +Tue Aug 1 11:18:32 CEST 2006 - mvidner@suse.cz + +- NetworkManager cannot do additional addresses, disable the dialog + (#165059). +- NetworkManager now respects DHCLIENT_MODIFY_RESOLV_CONF, enable the + checkbox accordingly (#156830). +- 2.13.59 + +------------------------------------------------------------------- +Tue Jul 18 17:15:34 CEST 2006 - mvidner@suse.cz + +- Better logging of the internet test (#192745). + +------------------------------------------------------------------- +Sun Jul 16 08:54:55 CEST 2006 - olh@suse.de + +- introduce a Linuxrc::display_ip and use it instead of Arch::s390 +- 2.13.58 + +------------------------------------------------------------------- +Mon Jul 10 16:23:39 CEST 2006 - mvidner@suse.cz + +- After the installation, use the correct module for the card over + which the installation was done (#186000). +- Include also WiFi cards in the DSL PPPoE dialog (#186102). +- 2.13.57 + +------------------------------------------------------------------- Old: ---- yast2-network-2.13.56.tar.bz2 New: ---- yast2-network-2.13.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.UNwG0f/_old 2006-08-01 17:03:05.000000000 +0200 +++ /var/tmp/diff_new_pack.UNwG0f/_new 2006-08-01 17:03:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.13.56) +# spec file for package yast2-network (Version 2.13.59) # # 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.13.56 +Version: 2.13.59 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.13.56.tar.bz2 +Source0: yast2-network-2.13.59.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -26,7 +26,8 @@ # carrier detection Requires: yast2-core >= 2.10.6 # String::Random -Requires: yast2 >= 2.13.34 +# Linuxrc::display_ip +Requires: yast2 >= 2.13.67 Requires: sysconfig yast2-country yast2-inetd yast2-packager PreReq: /bin/rm Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl @@ -49,7 +50,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-network-2.13.56 +%setup -n yast2-network-2.13.59 %build %{prefix}/bin/y2tool y2autoconf @@ -103,6 +104,22 @@ /usr/share/YaST2/schema/autoyast/rnc/networking.rnc %changelog -n yast2-network +* Tue Aug 01 2006 - mvidner@suse.cz +- NetworkManager cannot do additional addresses, disable the dialog + (#165059). +- NetworkManager now respects DHCLIENT_MODIFY_RESOLV_CONF, enable the + checkbox accordingly (#156830). +- 2.13.59 +* Tue Jul 18 2006 - mvidner@suse.cz +- Better logging of the internet test (#192745). +* Sun Jul 16 2006 - olh@suse.de +- introduce a Linuxrc::display_ip and use it instead of Arch::s390 +- 2.13.58 +* Mon Jul 10 2006 - mvidner@suse.cz +- After the installation, use the correct module for the card over + which the installation was done (#186000). +- Include also WiFi cards in the DSL PPPoE dialog (#186102). +- 2.13.57 * Fri Jun 09 2006 - locilka@suse.cz - Identify the release notes downloaded during the internet test by the product name (#180581). ++++++ yast2-network-2.13.56.tar.bz2 -> yast2-network-2.13.59.tar.bz2 ++++++ ++++ 6580 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.13.56/VERSION new/yast2-network-2.13.59/VERSION --- old/yast2-network-2.13.56/VERSION 2006-06-09 11:10:06.000000000 +0200 +++ new/yast2-network-2.13.59/VERSION 2006-08-01 11:17:39.000000000 +0200 @@ -1 +1 @@ -2.13.56 +2.13.59 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.13.56/configure.in new/yast2-network-2.13.59/configure.in --- old/yast2-network-2.13.56/configure.in 2006-06-09 11:13:18.000000000 +0200 +++ new/yast2-network-2.13.59/configure.in 2006-08-01 11:22:29.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.13.56, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.13.59, 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.13.56" +VERSION="2.13.59" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner@suse.cz>" 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.13.56/src/clients/lan_proposal.ycp new/yast2-network-2.13.59/src/clients/lan_proposal.ycp --- old/yast2-network-2.13.56/src/clients/lan_proposal.ycp 2006-02-13 12:07:46.000000000 +0100 +++ new/yast2-network-2.13.59/src/clients/lan_proposal.ycp 2006-07-17 10:33:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Lan configuration proposal * Authors: Michal Svec <msvec@suse.cz> * - * $Id: lan_proposal.ycp 27596 2006-02-05 19:14:54Z mvidner $ + * $Id: lan_proposal.ycp 31881 2006-07-16 07:08:51Z olh $ */ { @@ -109,7 +109,7 @@ // popup already shown y2error("Packages installation failure, not saving"); } - else if (Arch::s390 () || Linuxrc::vnc () || Linuxrc::usessh () ) + else if (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh () ) { y2milestone ("write only"); Lan::WriteOnly(); 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.13.56/src/dsl/dialogs.ycp new/yast2-network-2.13.59/src/dsl/dialogs.ycp --- old/yast2-network-2.13.56/src/dsl/dialogs.ycp 2006-02-03 08:51:24.000000000 +0100 +++ new/yast2-network-2.13.59/src/dsl/dialogs.ycp 2006-07-10 16:17:57.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs for DSL * Authors: Michal Svec <msvec@suse.cz> * - * $Id: dialogs.ycp 21341 2005-02-07 16:15:59Z mvidner $ + * $Id: dialogs.ycp 31775 2006-07-10 14:19:29Z mvidner $ */ { @@ -111,6 +111,7 @@ ifaces = union(ifaces, NetworkDevices::List("eth-pcmcia")); y2debug("ifaces=%1", ifaces); ifaces = union(ifaces, NetworkDevices::List("eth-usb")); + ifaces = union(ifaces, NetworkDevices::List("wlan")); // #186102 y2debug("ifaces=%1", ifaces); /* FIXME Why is not the current interface added? */ 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.13.56/src/installation/inst_do_net_test.ycp new/yast2-network-2.13.59/src/installation/inst_do_net_test.ycp --- old/yast2-network-2.13.56/src/installation/inst_do_net_test.ycp 2006-06-09 11:12:47.000000000 +0200 +++ new/yast2-network-2.13.59/src/installation/inst_do_net_test.ycp 2006-07-18 17:15:49.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Arvin Schnell <arvin@suse.de> * - * $Id: inst_do_net_test.ycp 31415 2006-06-09 09:12:38Z locilka $ + * $Id: inst_do_net_test.ycp 31943 2006-07-18 15:17:18Z mvidner $ */ { @@ -520,7 +520,7 @@ `prio : 16 ]); if(!Internet::Start(logdir + "/ifup.log")) { // popup to inform user about the failure - Popup::Message(_("Connecting to the Internet failed. View + Report::Error(_("Connecting to the Internet failed. View the logs for details. ")); test_stage = `finish; @@ -545,7 +545,7 @@ // status must be up if(!Internet::Status()) { // popup to inform user about the failure - Popup::Message(_("Connecting to the Internet failed. View + Report::Error(_("Connecting to the Internet failed. View the logs for details. ")); test_stage = `finish; @@ -589,7 +589,7 @@ if (!download_release_notes ()) { // popup to inform user about the failure - Popup::Message(_("Download of latest release notes failed. View + Report::Error(_("Download of latest release notes failed. View the logs for details. ")); test_stage = `close; @@ -641,7 +641,7 @@ else { // popup to inform user about the failure - Popup::Message(_("Check for latest updates failed. View + Report::Error(_("Check for latest updates failed. View the logs for details. ")); test_result = `failure; 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.13.56/src/installation/inst_netsetup.ycp new/yast2-network-2.13.59/src/installation/inst_netsetup.ycp --- old/yast2-network-2.13.56/src/installation/inst_netsetup.ycp 2006-04-27 08:16:15.000000000 +0200 +++ new/yast2-network-2.13.59/src/installation/inst_netsetup.ycp 2006-07-17 10:33:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Setup network in continue mode if required * Authors: Arvin Schnell <arvin@suse.de> * - * $Id: inst_netsetup.ycp 29633 2006-04-03 14:55:23Z mvidner $ + * $Id: inst_netsetup.ycp 31881 2006-07-16 07:08:51Z olh $ * * This is broken by design, see also #116537. * It overlaps create_interface from the 1st stage. @@ -118,7 +118,7 @@ */ define boolean do_network_setup () { - if (Mode::test () || Arch::s390 () || Linuxrc::vnc () || Linuxrc::usessh ()) { + if (Mode::test () || Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh ()) { y2milestone("NOT doing the basic network setup"); return false; } 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.13.56/src/lan/virtual.ycp new/yast2-network-2.13.59/src/lan/virtual.ycp --- old/yast2-network-2.13.56/src/lan/virtual.ycp 2006-02-03 08:51:28.000000000 +0100 +++ new/yast2-network-2.13.59/src/lan/virtual.ycp 2006-08-01 11:21:18.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Multiple addresses dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: virtual.ycp 24820 2005-08-11 14:28:20Z mvidner $ + * $Id: virtual.ycp 32076 2006-08-01 09:22:49Z mvidner $ */ { @@ -16,7 +16,9 @@ import "Lan"; import "Netmask"; import "NetworkDevices"; +import "NetworkService"; import "Popup"; +import "Report"; import "Wizard"; include "network/routines.ycp"; @@ -65,6 +67,15 @@ ScreenName("lan-virtual"); + //#165059 + if (NetworkService::IsManaged()) + { + // message popup + Report::Message (_("This setting is not available +because NetworkManager does not support it.")); + return `next; + } + /* Aliases dialog caption */ string caption = _("Additional Addresses"); 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.13.56/src/modules/Internet.ycp new/yast2-network-2.13.59/src/modules/Internet.ycp --- old/yast2-network-2.13.56/src/modules/Internet.ycp 2006-05-18 08:42:59.000000000 +0200 +++ new/yast2-network-2.13.59/src/modules/Internet.ycp 2006-07-18 17:15:49.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Arvin Schnell <arvin@suse.de> * - * $Id: Internet.ycp 30981 2006-05-17 15:27:53Z mvidner $ + * $Id: Internet.ycp 31943 2006-07-18 15:17:18Z mvidner $ */ { @@ -143,8 +143,11 @@ global define boolean Start(string log) { if ((type == "dsl" && capi_adsl) || (type == "isdn")) { - if (Service::Status ("isdn") != 0) { + integer status = Service::Status ("isdn"); + y2milestone ("We need ISDN service, status: %1", status); + if (status != 0) { if (! Service::Start ("isdn")) { + y2error ("start failed"); return false; } } 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.13.56/src/modules/Lan.ycp new/yast2-network-2.13.59/src/modules/Lan.ycp --- old/yast2-network-2.13.56/src/modules/Lan.ycp 2006-06-01 10:09:32.000000000 +0200 +++ new/yast2-network-2.13.59/src/modules/Lan.ycp 2006-08-01 11:16:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: Lan.ycp 31174 2006-05-29 15:29:23Z mvidner $ + * $Id: Lan.ycp 32071 2006-08-01 09:18:11Z mvidner $ * * Representation of the configuration of network cards. * Input and output routines. @@ -1216,6 +1216,11 @@ NetworkModules::DeleteM(nm_name); // FIXME: NI DeleteDevice2(NetworkDevices::device_name(type, device)); } + // #145001 + /* + NetworkUdev::Delete (device); + HwStatus::... + */ } else { // FIXME: NI DeleteDevice2(NetworkDevices::device_name(type, device) + ":" + 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.13.56/src/routines/install.ycp new/yast2-network-2.13.59/src/routines/install.ycp --- old/yast2-network-2.13.56/src/routines/install.ycp 2006-03-06 19:47:41.000000000 +0100 +++ new/yast2-network-2.13.59/src/routines/install.ycp 2006-07-10 16:24:08.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: install.ycp 28431 2006-02-28 10:43:28Z mvidner $ + * $Id: install.ycp 31776 2006-07-10 14:25:37Z mvidner $ * * All install.inf settings are stored in a global variable InstallInf. */ @@ -92,6 +92,22 @@ InstallInf["hostname"] = ""; } + // #180821, todo cleanup + if (netdevice != "") + { + string mod = (string) SCR::Read (add (.etc.install_inf_alias, netdevice)); + if (mod != "" && mod != nil) + { + InstallInf["module"] = mod; + string options = (string) SCR::Read (add (.etc.install_inf_options, mod)); + if (options != "" && options != nil) + { + InstallInf["options"] = options; + } + } + } + else + { // FIXME: alias = eth0 tulip // FIXME: options = ne io=0x200 @@ -106,6 +122,7 @@ if (options != "") { InstallInf["options"] = DeleteFirstWord (options); } + } y2milestone("InstallInf(%1)", InstallInf); return true; 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.13.56/src/services/dns.ycp new/yast2-network-2.13.59/src/services/dns.ycp --- old/yast2-network-2.13.56/src/services/dns.ycp 2006-04-07 14:36:21.000000000 +0200 +++ new/yast2-network-2.13.59/src/services/dns.ycp 2006-08-01 11:16:03.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Martin Vidner <mvidner@suse.cz> * - * $Id: dns.ycp 29828 2006-04-06 18:01:20Z mvidner $ + * $Id: dns.ycp 32070 2006-08-01 09:17:32Z mvidner $ */ { @@ -20,7 +20,6 @@ import "Label"; import "Lan"; import "NetworkConfig"; -import "NetworkService"; import "Popup"; include "network/routines.ycp"; @@ -472,7 +471,7 @@ /* DNS dialog caption */ string caption = _("Hostname and Name Server Configuration"); - has_dhcp = NetworkService::IsManaged () || + has_dhcp = // NetworkService::IsManaged () not: #169858, #156830 Lan::bootproto == "dhcp" || Lan::AnyDHCPDevice (); hn_settings = InitSettings (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de