Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Apr 13 16:56:38 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-04-10 16:43:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-04-13 09:32:17.383657000 +0200
@@ -1,0 +2,8 @@
+Thu Apr 12 16:00:12 CEST 2007 - mzugec@suse.cz
+
+- when NetworkManager enabled, install KNetworkManager/GnomeNetworkManager applet(#260532)
+- during installation propose first connected interface (#256606)
+- cosmetic fix - don't show IP/NETMASK for BOOTPROTO=NONE in description
+- 2.15.26
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.25.tar.bz2
New:
----
yast2-network-2.15.26.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.eW1507/_old 2007-04-13 16:56:26.000000000 +0200
+++ /var/tmp/diff_new_pack.eW1507/_new 2007-04-13 16:56:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.25)
+# spec file for package yast2-network (Version 2.15.26)
#
# 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.25
+Version: 2.15.26
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.25.tar.bz2
+Source0: yast2-network-2.15.26.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -51,7 +51,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.25
+%setup -n yast2-network-2.15.26
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,11 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog
+* Thu Apr 12 2007 - mzugec@suse.cz
+- when NetworkManager enabled, install KNetworkManager/GnomeNetworkManager applet(#260532)
+- during installation propose first connected interface (#256606)
+- cosmetic fix - don't show IP/NETMASK for BOOTPROTO=NONE in description
+- 2.15.26
* Tue Apr 10 2007 - kmachalkova@suse.cz
- DHCP client options dialog rewritten to CWM and integrated into
General options tab
++++++ yast2-network-2.15.25.tar.bz2 -> yast2-network-2.15.26.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.25/configure new/yast2-network-2.15.26/configure
--- old/yast2-network-2.15.25/configure 2007-04-05 14:23:24.000000000 +0200
+++ new/yast2-network-2.15.26/configure 2007-04-12 15:59:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-network 2.15.24.
+# Generated by GNU Autoconf 2.60 for yast2-network 2.15.25.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.24'
-PACKAGE_STRING='yast2-network 2.15.24'
+PACKAGE_VERSION='2.15.25'
+PACKAGE_STRING='yast2-network 2.15.25'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.24 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.25 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.24:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.25:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.24
+yast2-network configure 2.15.25
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.24, which was
+It was created by yast2-network $as_me 2.15.25, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.24'
+ VERSION='2.15.25'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.24"
+VERSION="2.15.25"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3258,7 +3258,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.15.24, which was
+This file was extended by yast2-network $as_me 2.15.25, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.24
+yast2-network config.status 2.15.25
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.25/configure.in new/yast2-network-2.15.26/configure.in
--- old/yast2-network-2.15.25/configure.in 2007-04-05 14:23:18.000000000 +0200
+++ new/yast2-network-2.15.26/configure.in 2007-04-12 15:59:38.000000000 +0200
@@ -3,7 +3,7 @@
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.24, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.25, 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.24"
+VERSION="2.15.25"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.25/src/lan/address.ycp new/yast2-network-2.15.26/src/lan/address.ycp
--- old/yast2-network-2.15.25/src/lan/address.ycp 2007-04-10 16:27:38.000000000 +0200
+++ new/yast2-network-2.15.26/src/lan/address.ycp 2007-04-12 15:59:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 37370 2007-04-10 14:27:36Z kmachalkova $
+ * $Id: address.ycp 37397 2007-04-11 13:04:38Z kmachalkova $
*/
{
@@ -347,10 +347,11 @@
* (disables it when SuSEFirewall is not installed)
* @param key id of the widget
*/
-symbol InitFwZone(string key) {
- if( !SuSEFirewall4Network::IsInstalled() )
+void InitFwZone(string key) {
+ if( SuSEFirewall4Network::IsInstalled() )
+ UI::ChangeWidget(`id("FWZONE"), `Value, settings["FWZONE"]:"");
+ else
UI::ChangeWidget(`id("FWZONE"), `Enabled, false);
- return nil;
}
@@ -403,7 +404,7 @@
// Combo Box label
"label": "Assign Interface to Firewall &Zone",
"opt": [`hstretch],
- "help": help["fw
*
- * $Id: Lan.ycp 37324 2007-04-05 08:32:30Z mzugec $
+ * $Id: Lan.ycp 37420 2007-04-12 13:57:34Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -240,6 +240,18 @@
modified = false;
}
+
+boolean CheckNetworkManagerPlugin(){
+ if (NetworkService::IsManaged()){
+ y2milestone("Check what package is needed to configure NetworkManager");
+ string nmp = ((string)SCR::Read(.sysconfig.windowmanager.DEFAULT_WM)=="kde")?"NetworkManager-kde":"NetworkManager-gnome";
+ y2milestone("Test for %1 if installed", nmp);
+ PackageSystem::CheckAndInstallPackages([nmp]);
+ }
+ return true;
+}
+
+
// functions for use from autoinstallation
global define boolean isAnyInterfaceDown(){
boolean down = false;
@@ -618,7 +630,7 @@
sleep(sl);
}
- if(Abort()) return false;
+ if(!CheckNetworkManagerPlugin()) return false;
/* Final progress step */
ProgressNextStage(_("Finished"));
sleep(sl);
@@ -1546,25 +1558,36 @@
} else {
// this is the first interface, match the hardware with install.inf
- /* Select the one from install.inf with the same MAC */
- // find H["mac"] == InstallInf["hwaddr"]
- if (tosel == nil ) {
+ if (size(InstallInf)>0){
+ /* Select the one from install.inf with the same MAC */
+ // find H["mac"] == InstallInf["hwaddr"]
+ if (tosel == nil ) {
string hwaddr = InstallInf["hwaddr"]:"";
if(hwaddr != nil && hwaddr != "") {
tosel = find (map h, Hardware, ``( h["mac"]:"" == hwaddr ));
}
y2milestone("Rule: matching hwaddr in install.inf");
- }
+ }
- /* Select the one from install.inf with the same module */
- // find H["module"] == InstallInf["module"]
- if (tosel == nil) {
+ /* Select the one from install.inf with the same module */
+ // find H["module"] == InstallInf["module"]
+ if (tosel == nil) {
string infmodule = InstallInf["module"]:"";
if(infmodule != nil && infmodule != "") {
tosel = find (map h, Hardware, ``( h["module"]:"" == infmodule ));
}
y2milestone("Rule: matching module in install.inf");
- }
+ }
+ } else{
+ /* No install.inf -> select the first connected */
+ // find H["active"] == true
+ if (tosel == nil) {
+ tosel = find (map h, Hardware, ``(
+ h["link", "state"]:false
+ ));
+ y2milestone("Rule: first connected");
+ }
+ }
/* No install.inf driver -> select the first active */
// find H["active"] == true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.25/src/routines/complex.ycp new/yast2-network-2.15.26/src/routines/complex.ycp
--- old/yast2-network-2.15.25/src/routines/complex.ycp 2007-03-12 16:05:03.000000000 +0100
+++ new/yast2-network-2.15.26/src/routines/complex.ycp 2007-04-12 16:01:00.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec
*
- * $Id: complex.ycp 36863 2007-03-12 10:47:37Z mzugec $
+ * $Id: complex.ycp 37420 2007-04-12 13:57:34Z mzugec $
*
*/
@@ -464,7 +464,7 @@
return _("Managed");
}
string ip = devmap["BOOTPROTO"]:"static";
- if(ip == nil || ip == "" || ip == "static" || ip == "none")
+ if(ip == nil || ip == "" || ip == "static")
ip = devmap["IPADDR"]:"";
else ip = toupper(ip);
return ip;
@@ -492,10 +492,10 @@
// summary description of STARTMODE=off
"off" : _("Will not be started at all")
];
-list<string> models = [];
-foreach(maprow, (list