Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Mon May 4 18:39:04 CEST 2009. -------- --- yast2-network/yast2-network.changes 2009-04-28 16:23:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2009-05-04 15:13:31.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 4 14:48:06 CEST 2009 - mzugec@suse.de + +- fixed: after autoinstall, dns and routing info are lost + (bnc#498993) +- 2.18.31 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.u12088/_old 2009-05-04 18:38:48.000000000 +0200 +++ /var/tmp/diff_new_pack.u12088/_new 2009-05-04 18:38:48.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-network Version: 2.18.30 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -142,6 +142,10 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Mon May 04 2009 mzugec@suse.de +- fixed: after autoinstall, dns and routing info are lost + (bnc#498993) +- 2.18.31 * Tue Apr 28 2009 mzugec@suse.de - correctly read/write module options (bnc#487656) - 2.18.30 ++++++ yast2-network-2.18.30.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/configure new/yast2-network-2.18.30/configure --- old/yast2-network-2.18.30/configure 2009-04-25 02:21:55.000000000 +0200 +++ new/yast2-network-2.18.30/configure 2009-05-04 13:51:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-network 2.18.29. +# Generated by GNU Autoconf 2.63 for yast2-network 2.18.30. # # Report bugs to http://bugs.opensuse.org/. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.18.29' -PACKAGE_STRING='yast2-network 2.18.29' +PACKAGE_VERSION='2.18.30' +PACKAGE_STRING='yast2-network 2.18.30' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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.18.29 to adapt to many kinds of systems. +`configure' configures yast2-network 2.18.30 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.18.29:";; + short | recursive ) echo "Configuration of yast2-network 2.18.30:";; esac cat <<_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2-network configure 2.18.29 +yast2-network configure 2.18.30 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,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.18.29, which was +It was created by yast2-network $as_me 2.18.30, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.18.29' + VERSION='2.18.30' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.18.29" +VERSION="2.18.30" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" @@ -3451,7 +3451,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.18.29, which was +This file was extended by yast2-network $as_me 2.18.30, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\ -yast2-network config.status 2.18.29 +yast2-network config.status 2.18.30 configured by $0, generated by GNU Autoconf 2.63, with options \"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/configure.in new/yast2-network-2.18.30/configure.in --- old/yast2-network-2.18.30/configure.in 2009-04-25 02:21:42.000000000 +0200 +++ new/yast2-network-2.18.30/configure.in 2009-05-04 13:51:36.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.18.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.4 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.18.29, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.18.30, 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.18.29" +VERSION="2.18.30" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/Makefile.am new/yast2-network-2.18.30/Makefile.am --- old/yast2-network-2.18.30/Makefile.am 2009-04-25 02:21:43.000000000 +0200 +++ new/yast2-network-2.18.30/Makefile.am 2009-05-04 13:51:36.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #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 +ACLOCAL_AMFLAGS = -I . -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 cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/Makefile.in new/yast2-network-2.18.30/Makefile.in --- old/yast2-network-2.18.30/Makefile.in 2009-04-25 02:22:03.000000000 +0200 +++ new/yast2-network-2.18.30/Makefile.in 2009-05-04 13:51:56.000000000 +0200 @@ -226,10 +226,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #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 +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/src/clients/dns_auto.ycp new/yast2-network-2.18.30/src/clients/dns_auto.ycp --- old/yast2-network-2.18.30/src/clients/dns_auto.ycp 2009-04-02 09:32:38.000000000 +0200 +++ new/yast2-network-2.18.30/src/clients/dns_auto.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -/** - * File: clients/dns_auto.ycp - * Package: Network configuration - * Summary: Client for autoinstallation - * Authors: Michal Svec <msvec@suse.cz> - * - * $Id: dns_auto.ycp 20958 2005-01-25 16:34:37Z mvidner $ - * - * This is a client for autoinstallation. It takes its arguments, - * goes through the configuration and return the setting. - * Does not do any changes to the configuration. - */ - -/** - * @param function to execute - * @param map/list of dns settings - * @return map edited settings, Summary or boolean on success depending on called function - * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("dns_auto", [ "Summary", mm ]); - */ - -{ - -textdomain "network"; - -y2milestone("----------------------------------------"); -y2milestone("DNS auto started"); - -import "DNS"; -import "Wizard"; - -include "network/services/dns.ycp"; - -any ret = nil; -string func = ""; -map param = $[]; - -/* Check arguments */ -if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { - func = (string) WFM::Args(0); - if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) - param = (map) WFM::Args(1); -} -y2debug("func=%1", func); -y2debug("param=%1", param); - -/* Create a summary*/ -if(func == "Summary") { - ret = DNS::Summary(); -} -/* Reset configuration */ -else if (func == "Reset") { - DNS::Import($[]); - ret = $[]; -} -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("dns"); - ret = DNSMainDialog(true); - UI::CloseDialog(); -} -/* Import configuration */ -else if (func == "Import") { - ret = DNS::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = DNS::Export(); -} -/* Write givven settings */ -else if (func == "Write") { - import "Progress"; - boolean progress_orig = Progress::set (false); - // DNS::write_only = true; - ret = DNS::Write(); - Progress::set (progress_orig); -} -/* Unknown function */ -else { - y2error("Unknown function: %1", func); - ret = false; -} - -y2debug("ret=%1", ret); -y2milestone("DNS auto finished"); -y2milestone("----------------------------------------"); - -return ret; - -/* EOF */ -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/src/clients/lan_auto.ycp new/yast2-network-2.18.30/src/clients/lan_auto.ycp --- old/yast2-network-2.18.30/src/clients/lan_auto.ycp 2009-04-02 09:32:38.000000000 +0200 +++ new/yast2-network-2.18.30/src/clients/lan_auto.ycp 2009-05-04 13:39:15.000000000 +0200 @@ -284,6 +284,29 @@ ret = LanAutoSequence(""); } else if(func == "Import") { + // see bnc#498993 + // in case keep_install_network is set to true (in AY) + // and there is no dns and routing definition, + // we'll keep values from installation + if(param["keep_install_network"]:false==true) { + y2milestone("keep_install_network is enabled"); + if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){ + y2milestone("DNS and routing are not defined in AY, will keep settings from installation"); + // read settings from installation + Lan::Read(`cache); + // export settings into AY map + map from_system=Lan::Export(); + map dns=from_system["dns"]:$[]; + map routing=from_system["routing"]:$[]; + // merge with param + param["dns"]=dns; + param["routing"]=routing; + y2milestone("", dns); + y2milestone("", routing); + } else{ + y2milestone("DNS and routing defined in AY profile, will use it"); + } + } map new = FromAY(param); Lan::Import(new); ret = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/src/clients/routing_auto.ycp new/yast2-network-2.18.30/src/clients/routing_auto.ycp --- old/yast2-network-2.18.30/src/clients/routing_auto.ycp 2009-04-02 09:32:38.000000000 +0200 +++ new/yast2-network-2.18.30/src/clients/routing_auto.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,91 +0,0 @@ -/** - * File: clients/routing_auto.ycp - * Package: Network configuration - * Summary: Client for autoinstallation - * Authors: Michal Svec <msvec@suse.cz> - * - * $Id: routing_auto.ycp 36863 2007-03-12 10:47:37Z mzugec $ - * - * This is a client for autoinstallation. It takes its arguments, - * goes through the configuration and return the setting. - * Does not do any changes to the configuration. - */ - -/** - * @param function to execute - * @param map/list of routing settings - * @return map edited settings, Summary or boolean on success depending on called function - * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("routing_auto", [ "Summary", mm ]); - */ - -{ - -textdomain "network"; - -y2milestone("----------------------------------------"); -y2milestone("Routing auto started"); - -import "Routing"; -import "Wizard"; - -include "network/services/routing.ycp"; - -any ret = nil; -string func = ""; -map param = $[]; - -/* Check arguments */ -if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { - func = (string) WFM::Args(0); - if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) - param = (map) WFM::Args(1); -} -y2debug("func=%1", func); -y2debug("param=%1", param); - -/* Create a summary*/ -if(func == "Summary") { - ret = Routing::Summary(); -} -/* Reset configuration */ -else if (func == "Reset") { - Routing::Import($[]); - ret = $[]; -} -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("routing"); - ret = RoutingMainDialog(); - UI::CloseDialog(); -} -/* Import configuration */ -else if (func == "Import") { - ret = Routing::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = Routing::Export(); -} -/* Write givven settings */ -else if (func == "Write") { - import "Progress"; - boolean progress_orig = Progress::set (false); - ret = Routing::Write(); - Progress::set (progress_orig); -} -/* Unknown function */ -else { - y2error("Unknown function: %1", func); - ret = false; -} - -y2debug("ret=%1", ret); -y2milestone("Routing auto finished"); -y2milestone("----------------------------------------"); - -return ret; - -/* EOF */ -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.30/src/modules/InternetDevices.ycp new/yast2-network-2.18.30/src/modules/InternetDevices.ycp --- old/yast2-network-2.18.30/src/modules/InternetDevices.ycp 2009-04-02 09:32:38.000000000 +0200 +++ new/yast2-network-2.18.30/src/modules/InternetDevices.ycp 2009-04-28 16:26:01.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Arvin Schnell <arvin@suse.de> * - * $Id:$ + * $Id: InternetDevices.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org