Hello community, here is the log from the commit of package yast2-network checked in at Fri May 19 17:01:20 CEST 2006. -------- --- yast2-network/yast2-network.changes 2006-05-17 17:31:44.000000000 +0200 +++ yast2-network/yast2-network.changes 2006-05-19 15:25:05.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 19 15:21:54 CEST 2006 - mvidner@suse.cz + +- Tell NetworkManager when writing the dialup settings by calling + rcnetwork reload (#162959). +- 2.13.50 + +------------------------------------------------------------------- Old: ---- yast2-network-2.13.49.tar.bz2 New: ---- yast2-network-2.13.50.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.iVDaYR/_old 2006-05-19 16:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.iVDaYR/_new 2006-05-19 16:57:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.13.49) +# spec file for package yast2-network (Version 2.13.50) # # 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.49 +Version: 2.13.50 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.13.49.tar.bz2 +Source0: yast2-network-2.13.50.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -49,7 +49,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-network-2.13.49 +%setup -n yast2-network-2.13.50 %build %{prefix}/bin/y2tool y2autoconf @@ -103,6 +103,10 @@ /usr/share/YaST2/schema/autoyast/rnc/networking.rnc %changelog -n yast2-network +* Fri May 19 2006 - mvidner@suse.cz +- Tell NetworkManager when writing the dialup settings by calling + rcnetwork reload (#162959). +- 2.13.50 * Wed May 17 2006 - mvidner@suse.cz - For iucv, create static hwcfgs, like hwcfg-static-iucv-id-$ID (#176330). ++++++ yast2-network-2.13.49.tar.bz2 -> yast2-network-2.13.50.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/VERSION new/yast2-network-2.13.50/VERSION --- old/yast2-network-2.13.49/VERSION 2006-05-17 17:31:41.000000000 +0200 +++ new/yast2-network-2.13.50/VERSION 2006-05-19 15:21:45.000000000 +0200 @@ -1 +1 @@ -2.13.49 +2.13.50 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/configure new/yast2-network-2.13.50/configure --- old/yast2-network-2.13.49/configure 2006-05-18 16:53:00.000000000 +0200 +++ new/yast2-network-2.13.50/configure 2006-05-19 15:27:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-network 2.13.49. +# Generated by GNU Autoconf 2.59 for yast2-network 2.13.50. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.13.49' -PACKAGE_STRING='yast2-network 2.13.49' +PACKAGE_VERSION='2.13.50' +PACKAGE_STRING='yast2-network 2.13.50' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,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.13.49 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.13.50 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.13.49:";; + short | recursive ) echo "Configuration of yast2-network 2.13.50:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.13.49 +yast2-network configure 2.13.50 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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.13.49, which was +It was created by yast2-network $as_me 2.13.50, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.13.49' + VERSION='2.13.50' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.49" +VERSION="2.13.50" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner@suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-network $as_me 2.13.49, which was +This file was extended by yast2-network $as_me 2.13.50, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.13.49 +yast2-network config.status 2.13.50 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/configure.in new/yast2-network-2.13.50/configure.in --- old/yast2-network-2.13.49/configure.in 2006-05-18 16:52:44.000000000 +0200 +++ new/yast2-network-2.13.50/configure.in 2006-05-19 15:27:08.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.13.49, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.13.50, 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.49" +VERSION="2.13.50" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/src/clients/routing.ycp new/yast2-network-2.13.50/src/clients/routing.ycp --- old/yast2-network-2.13.49/src/clients/routing.ycp 2006-01-05 16:42:55.000000000 +0100 +++ new/yast2-network-2.13.50/src/clients/routing.ycp 2006-05-19 15:15:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routing client * Authors: Michal Svec <msvec@suse.cz> * - * $Id: routing.ycp 21545 2005-02-11 16:37:21Z mvidner $ + * $Id: routing.ycp 31064 2006-05-19 13:15:31Z mvidner $ * * Main file for routing configuration. * Uses all other files. @@ -24,6 +24,7 @@ import "CommandLine"; import "RichText"; +import "NetworkService"; /** * Return a modification status @@ -33,7 +34,6 @@ return Routing::Modified(); } -include "network/runtime.ycp"; include "network/services/routing.ycp"; /** @@ -52,7 +52,7 @@ if(ret == `next && Routing::Modified()) { Routing::Write(); - ReloadOrStartNetwork(); + NetworkService::StartStop (); } UI::CloseDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/src/modules/DSL.ycp new/yast2-network-2.13.50/src/modules/DSL.ycp --- old/yast2-network-2.13.49/src/modules/DSL.ycp 2006-02-05 17:39:24.000000000 +0100 +++ new/yast2-network-2.13.50/src/modules/DSL.ycp 2006-05-19 15:14:21.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: DSL data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: DSL.ycp 27593 2006-02-05 16:39:17Z mvidner $ + * $Id: DSL.ycp 31063 2006-05-19 13:14:14Z mvidner $ * * Representation of the configuration of DSL. * Input and output routines. @@ -19,6 +19,7 @@ import "Detection"; import "Lan"; import "NetworkDevices"; +import "NetworkService"; import "Provider"; import "Progress"; import "Summary"; @@ -107,6 +108,8 @@ */ symbol operation = nil; +const boolean write_only = false; + /*------------------*/ /* GLOBAL FUNCTIONS */ @@ -166,6 +169,7 @@ /* Progress step 2/5 */ ProgressNextStage(_("Reading current configuration...")); NetworkDevices::Read(); + NetworkService::Read (); sleep(sl); if(Abort()) return false; @@ -223,7 +227,7 @@ /* Write dialog caption */ string caption = _("Saving DSL Configuration"); - integer steps = 7; + integer steps = 8; integer sl = 0; /* 1000; /* TESTING */ sleep(sl); @@ -243,6 +247,8 @@ _("Set up smpppd"), /* Progress stage 7/7 */ _("Run KInternet"), + /* Progress stage 9 */ + _("Activate network services"), ], [], ""); /* Stop the detection */ @@ -279,7 +285,7 @@ if(Abort()) return false; /* Progress step 5/7 */ ProgressNextStage(_("Setting up network services...")); - EnableNetwork(); + NetworkService::EnableDisable (); sleep(sl); if(Abort()) return false; @@ -295,6 +301,15 @@ sleep(sl); if(Abort()) return false; + /* Progress step 9 */ + ProgressNextStage(_("Activating network services...")); + if(!write_only) { +// NetworkModules::HwUp (); // this is needed too + NetworkService::StartStop (); + } + sleep(sl); + + if(Abort()) return false; /* Final progress step */ ProgressNextStage(_("Finished")); sleep(sl); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/src/modules/ISDN.ycp new/yast2-network-2.13.50/src/modules/ISDN.ycp --- old/yast2-network-2.13.49/src/modules/ISDN.ycp 2006-01-05 16:42:55.000000000 +0100 +++ new/yast2-network-2.13.50/src/modules/ISDN.ycp 2006-05-19 15:14:21.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Karsten Keil <kkeil@suse.de> * - * $Id: ISDN.ycp 25304 2005-09-01 14:01:47Z mvidner $ + * $Id: ISDN.ycp 31063 2006-05-19 13:14:14Z mvidner $ * * Representation of the configuration of ISDN. * Input and output routines. @@ -17,6 +17,7 @@ textdomain "network"; import "NetworkDevices"; +import "NetworkService"; import "Provider"; import "Progress"; import "Summary"; @@ -285,6 +286,7 @@ // step 2 in reading current ISDN setup ProgressNextStage(_("Reading current device configuration...")); ReadISDNConfig("cfg-contr"); + NetworkService::Read (); sleep(sl); if(Abort()) return false; @@ -383,7 +385,7 @@ steps = 9; } if (haveISDNif) { - steps = steps + 4; + steps = steps + 5; // stage 11/13 plist = add(plist, _("Set up network services")); // stage 11/13 @@ -392,6 +394,8 @@ plist = add(plist, _("Start ISDN networking")); // stage 13/13 plist = add(plist, _("Run KInternet")); + /* Progress stage 9 */ + plist = add(plist, _("Activate network services")); } } @@ -481,7 +485,7 @@ if(Abort()) return false; // step 10 in writing current ISDN setup ProgressNextStage(_("Setting up network services...")); - EnableNetwork(); + NetworkService::EnableDisable (); sleep(sl); if(Abort()) return false; @@ -505,6 +509,17 @@ ProgressNextStage(_("Running KInternet...")); RunKInternet(); sleep(sl); + + if(Abort()) return false; + /* Progress step 9 */ + ProgressNextStage(_("Activating network services...")); + const boolean write_only = false; + if(!write_only) { +// NetworkModules::HwUp (); // this is needed too + NetworkService::StartStop (); + } + sleep(sl); + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/src/modules/Modem.ycp new/yast2-network-2.13.50/src/modules/Modem.ycp --- old/yast2-network-2.13.49/src/modules/Modem.ycp 2006-01-05 16:42:55.000000000 +0100 +++ new/yast2-network-2.13.50/src/modules/Modem.ycp 2006-05-19 15:14:22.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Modem data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: Modem.ycp 25020 2005-08-17 16:16:11Z mvidner $ + * $Id: Modem.ycp 31063 2006-05-19 13:14:14Z mvidner $ * * Representation of the configuration of modem. * Input and output routines. @@ -16,6 +16,7 @@ textdomain "network"; import "NetworkDevices"; +import "NetworkService"; import "Provider"; import "Progress"; import "Routing"; @@ -82,6 +83,8 @@ */ symbol operation = nil; +const boolean write_only = false; + /*------------------*/ /* GLOBAL FUNCTIONS */ @@ -134,6 +137,7 @@ /* Progress step 2/4 */ ProgressNextStage(_("Reading current configuration...")); NetworkDevices::Read(); + NetworkService::Read (); sleep(sl); if(Abort()) return false; @@ -179,7 +183,7 @@ /* Write dialog caption */ string caption = _("Saving Modem Configuration"); - integer steps = 6; + integer steps = 7; integer sl = 0; /* 1000; /* TESTING */ sleep(sl); @@ -197,6 +201,8 @@ _("Set up smpppd"), /* Progress stage 6/6 */ _("Run KInternet"), + /* Progress stage 9 */ + _("Activate network services"), ], [], ""); if(Abort()) return false; @@ -223,7 +229,7 @@ if(Abort()) return false; /* Progress step 4/6 */ ProgressNextStage(_("Setting up network services...")); - EnableNetwork(); + NetworkService::EnableDisable (); sleep(sl); /* Setup SL modem */ @@ -260,6 +266,15 @@ sleep(sl); if(Abort()) return false; + /* Progress step 9 */ + ProgressNextStage(_("Activating network services...")); + if(!write_only) { +// NetworkModules::HwUp (); // this is needed too + NetworkService::StartStop (); + } + sleep(sl); + + if(Abort()) return false; /* Final progress step */ ProgressNextStage(_("Finished")); sleep(sl); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.49/src/routines/runtime.ycp new/yast2-network-2.13.50/src/routines/runtime.ycp --- old/yast2-network-2.13.49/src/routines/runtime.ycp 2006-01-05 16:42:55.000000000 +0100 +++ new/yast2-network-2.13.50/src/routines/runtime.ycp 2006-05-19 15:15:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Runtime routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: runtime.ycp 26417 2005-12-05 14:43:45Z mvidner $ + * $Id: runtime.ycp 31064 2006-05-19 13:15:31Z mvidner $ */ { @@ -98,37 +98,6 @@ } /** - * Reload network configuration. If it was not running, start it instead - * @return true if success - */ -define boolean ReloadOrStartNetwork() { - if (Service::Status ("network") == 0) - { - // Workaround for bug #46055: - // Go to the / directory which is hopefully not mounted over the - // network so that yast survives network restart. - y2milestone("Reloading service %1", "network"); - string cmd = "cd /; /etc/init.d/network reload"; - return SCR::Execute (.target.bash, cmd) == 0; - } - else - { - return Service::Start ("network"); - } -} - -/** - * Enable the network service - * @return true if success - */ -define boolean EnableNetwork() { - // Workaround for bug #46055: - y2milestone("Enabling service %1", "network"); - string cmd = "cd /; /sbin/insserv -d /etc/init.d/network"; - return SCR::Execute (.target.bash, cmd) == 0; -} - -/** * Are there interfaces controlled by smpppd and kinternet? * They are the ones with USERCONTROL=yes (#44303) * @return true/false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de