Hello community,
here is the log from the commit of package yast2-network
checked in at Sat Sep 6 05:05:08 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-08-18 15:03:33.000000000 +0200
+++ yast2-network/yast2-network.changes 2008-09-05 14:36:59.421395000 +0200
@@ -1,0 +2,35 @@
+Fri Sep 5 14:34:01 CEST 2008 - mzugec@suse.cz
+
+- support for InfiniBand (fate#304870), (fate#304115)
+- 2.17.23
+
+-------------------------------------------------------------------
+Thu Sep 4 16:10:43 CEST 2008 - mzugec@suse.cz
+
+- alignment of add/edit/delete (bnc#421037)
+
+-------------------------------------------------------------------
+Thu Sep 4 16:04:09 CEST 2008 - mzugec@suse.cz
+
+- alignment of add/edit/delete (bnc#421033)
+
+-------------------------------------------------------------------
+Thu Sep 4 15:18:14 CEST 2008 - mzugec@suse.cz
+
+- IPv6 configuration (fate#304397)
+- installation with IPv6 (fate#302926)
+- 2.17.22
+
+-------------------------------------------------------------------
+Thu Sep 4 12:47:25 CEST 2008 - mzugec@suse.cz
+
+- fixed yast lan list configured|unconfigured (bnc#420449)
+- 2.17.21
+
+-------------------------------------------------------------------
+Wed Sep 3 10:50:48 CEST 2008 - kmachalkova@suse.cz
+
+- DNS data configuration adapted to using netconfig (resolv.conf is
+ no longer written directly)(FaTE#303618)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.17.20.tar.bz2
New:
----
yast2-network-2.17.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.a16548/_old 2008-09-06 05:02:29.000000000 +0200
+++ /var/tmp/diff_new_pack.a16548/_new 2008-09-06 05:02:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.17.20)
+# spec file for package yast2-network (Version 2.17.23)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.17.20
+Version: 2.17.23
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.17.20.tar.bz2
+Source0: yast2-network-2.17.23.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -36,7 +36,8 @@
BuildRequires: yast2-packager >= 2.16.37
# needed for prefixlen support in aliases
Requires: yast2 >= 2.17.5
-Requires: sysconfig
+#netconfig (FaTE #303618)
+Requires: sysconfig >= 0.71.2
Requires: yast2-packager >= 2.16.37
#GetLanguageCountry
#(in newly created yast2-country-data)
@@ -78,7 +79,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.17.20
+%setup -n yast2-network-2.17.23
%build
%{prefix}/bin/y2tool y2autoconf
@@ -142,6 +143,23 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Fri Sep 05 2008 mzugec@suse.cz
+- support for InfiniBand (fate#304870), (fate#304115)
+- 2.17.23
+* Thu Sep 04 2008 mzugec@suse.cz
+- alignment of add/edit/delete (bnc#421037)
+* Thu Sep 04 2008 mzugec@suse.cz
+- alignment of add/edit/delete (bnc#421033)
+* Thu Sep 04 2008 mzugec@suse.cz
+- IPv6 configuration (fate#304397)
+- installation with IPv6 (fate#302926)
+- 2.17.22
+* Thu Sep 04 2008 mzugec@suse.cz
+- fixed yast lan list configured|unconfigured (bnc#420449)
+- 2.17.21
+* Wed Sep 03 2008 kmachalkova@suse.cz
+- DNS data configuration adapted to using netconfig (resolv.conf is
+ no longer written directly)(FaTE#303618)
* Mon Aug 18 2008 mzugec@suse.cz
- fixed Lan::Required() function
- 2.17.20
++++++ yast2-network-2.17.20.tar.bz2 -> yast2-network-2.17.23.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/configure new/yast2-network-2.17.23/configure
--- old/yast2-network-2.17.20/configure 2008-08-18 13:29:29.000000000 +0200
+++ new/yast2-network-2.17.23/configure 2008-09-05 14:31:43.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-network 2.17.20.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.17.22.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.17.20'
-PACKAGE_STRING='yast2-network 2.17.20'
+PACKAGE_VERSION='2.17.22'
+PACKAGE_STRING='yast2-network 2.17.22'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.17.20 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.17.22 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.17.20:";;
+ short | recursive ) echo "Configuration of yast2-network 2.17.22:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.17.20
+yast2-network configure 2.17.22
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.17.20, which was
+It was created by yast2-network $as_me 2.17.22, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.17.20'
+ VERSION='2.17.22'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.20"
+VERSION="2.17.22"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,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.17.20, which was
+This file was extended by yast2-network $as_me 2.17.22, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.17.20
+yast2-network config.status 2.17.22
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/configure.in new/yast2-network-2.17.23/configure.in
--- old/yast2-network-2.17.20/configure.in 2008-08-18 13:29:09.000000000 +0200
+++ new/yast2-network-2.17.23/configure.in 2008-09-05 14:31:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.17.20, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.17.22, 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.17.20"
+VERSION="2.17.22"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/src/clients/lan_auto.ycp new/yast2-network-2.17.23/src/clients/lan_auto.ycp
--- old/yast2-network-2.17.20/src/clients/lan_auto.ycp 2008-07-23 15:21:32.000000000 +0200
+++ new/yast2-network-2.17.23/src/clients/lan_auto.ycp 2008-09-03 15:30:39.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec
*
- * $Id: lan_auto.ycp 49344 2008-07-23 12:21:31Z mzugec $
+ * $Id: lan_auto.ycp 50530 2008-09-01 14:40:41Z kmachalkova $
*/
{
@@ -161,9 +161,7 @@
if (haskey(dns, "dhcp_hostname"))
dhcp["DHCLIENT_SET_HOSTNAME"] = dns["dhcp_hostname"]:false;
- if (haskey(dns, "dhcp_resolv"))
- dhcp["DHCLIENT_MODIFY_RESOLV_CONF"] = dns["dhcp_resolv"]:false;
-
+
dhcp = UpcaseCondSet (dhcp, dhcpopts, "dhclient_client_id");
dhcp = UpcaseCondSet (dhcp, dhcpopts, "dhclient_additional_options");
dhcp = UpcaseCondSet (dhcp, dhcpopts, "dhclient_hostname_option");
@@ -231,11 +229,9 @@
map config = settings["config"]:$[];
map dhcp = config["dhcp"]:$[];
- boolean dhcp_resolv = dhcp["DHCLIENT_MODIFY_RESOLV_CONF"]:false;
boolean dhcp_hostname = dhcp["DHCLIENT_SET_HOSTNAME"]:false;
map dns = settings["dns"]:$[];
dns["dhcp_hostname"] = dhcp_hostname;
- dns["dhcp_resolv"] = dhcp_resolv;
map dhcpopts = $[];
if (haskey(dhcp, "DHCLIENT_HOSTNAME_OPTION"))
dhcpopts["dhclient_hostname_option"] = dhcp["DHCLIENT_HOSTNAME_OPTION"]:"AUTO";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/src/clients/lan.ycp new/yast2-network-2.17.23/src/clients/lan.ycp
--- old/yast2-network-2.17.20/src/clients/lan.ycp 2008-06-20 12:46:01.000000000 +0200
+++ new/yast2-network-2.17.23/src/clients/lan.ycp 2008-09-01 10:27:57.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards main file
* Authors: Michal Svec
*
- * $Id: lan.ycp 48430 2008-06-19 17:04:40Z mzugec $
+ * $Id: lan.ycp 50389 2008-08-26 17:27:15Z kmachalkova $
*
* Main file for network card configuration.
* Uses all other files.
@@ -52,13 +52,18 @@
"show" : $[
/* Commandline command help */
"help" : _("Display configuration summary"),
- "example" : "lan show id=...",
+ "example" : "lan show id=0",
"handler" : ShowHandler,
],
"add" : $[
/* Commandline command help */
"help" : _("Add a network card"),
"handler" : AddHandler,
+ "example" : [
+ "add device=eth0",
+ "add device=eth0 type=ethernet bootproto=dhcp",
+ "add device=eth0 name=bond0"
+ ]
],
"edit" : $[
"help" : _("Change existing configuration"),
@@ -71,12 +76,6 @@
]
],
"options" : $[
- "propose" : $[
- /* Commandline option help */
- "help" : _("Propose a configuration"),
- "example" : "lan add propose",
- "type" : ""
- ],
"configured" : $[
/* Commandline option help */
"help" : _("List only configured cards")
@@ -89,23 +88,19 @@
/* Commandline option help */
"help" : _("Device identifier"),
"type" : "string",
- "example" : "lan add device=eth0"
],
"id" : $[
/* Commandline option help */
"help" : _("Config identifier"),
"type" : "string",
- "example" : "lan show id=0"
],
"bootproto" : $[
"help" : _("Use static or dynamic configuration"),
"type" : "string",
- "example" : "add type=ethernet bootproto=dhcp"
],
"name" : $[
"help" : _("Configuration Name"),
"type" : "string",
- "example" : "add name=bond0"
],
"bootproto" : $[
/* Commandline option help */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/src/clients/save_network.ycp new/yast2-network-2.17.23/src/clients/save_network.ycp
--- old/yast2-network-2.17.20/src/clients/save_network.ycp 2008-08-06 09:10:24.000000000 +0200
+++ new/yast2-network-2.17.23/src/clients/save_network.ycp 2008-09-04 15:13:43.000000000 +0200
@@ -203,8 +203,11 @@
}
else
{
- //DHCP for IPv6 is not implemented yet in sysconfig
- network_configuration="BOOTPROTO='dhcp'\n";
+ //DHCP (also for IPv6) setup
+ if (InstallInf["bootproto"]:""=="dhcp") network_configuration="BOOTPROTO='dhcp4'\n";
+ else if (InstallInf["bootproto"]:""=="dhcp6") network_configuration="BOOTPROTO='dhcp6'\n";
+ else if (InstallInf["bootproto"]:""=="dhcp,dhcp6") network_configuration="BOOTPROTO='dhcp'\n";
+
// set DHCP_SET_HOSTNAME=yes #suse30528
y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system");
SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp");
@@ -315,17 +318,21 @@
y2warning("No routing information in install.inf");
// create resolv.conf only for static configuration
- if (size(InstallInf["nameserver"]:"")>0){
- string text = "";
+ if (size(InstallInf["nameserver"]:"")>0)
+ {
+ //Do not write /etc/resolv.conf directly, feed the data to sysconfig instead,
+ //'netconfig' will do the job later on network startup (FaTE #303618)
+ SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS, InstallInf["nameserver"]:"");
+ y2milestone("Writing static nameserver entry: %1", InstallInf["nameserver"]:"");
//Enter search domain data only if present
if( size(InstallInf["domain"]:"") > 0)
- text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:"");
- else
- //If we don't have search domain data, skip 'search' field,
- //do not leave out 'nameserver' completely - #298001
- text = sformat("nameserver %1\n", InstallInf["nameserver"]:"");
- y2milestone("Write resolv.conf content: %1", text);
- SCR::Write(.target.string, "/etc/resolv.conf", text);
+ {
+ SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, InstallInf["domain"]:"");
+ y2milestone("Writing static searchlist entry: %1", InstallInf["domain"]:"");
+ }
+ //We're done. It is OK not to touch NETCONFIG_DNS_POLICY now as it is set to 'auto' by default
+ //and user did not have a chance to modify it up to now
+ SCR::Write(.sysconfig.network.config, nil);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/src/config/networking.rnc new/yast2-network-2.17.23/src/config/networking.rnc
--- old/yast2-network-2.17.20/src/config/networking.rnc 2008-04-21 12:32:10.000000000 +0200
+++ new/yast2-network-2.17.23/src/config/networking.rnc 2008-09-02 13:29:34.000000000 +0200
@@ -210,14 +210,14 @@
dns =
element dns {
dhcp_hostname ? &
- dhcp_resolv ? &
+ resolv_conf_policy ? &
hostname ? &
domain ? &
nameservers ? &
searchlist ?
}
dhcp_hostname = element dhcp_hostname { BOOLEAN }
-dhcp_resolv = element dhcp_resolv { BOOLEAN }
+resolv_conf_policy = element resolv_conf_policy { text }
hostname = element hostname { text }
domain = element domain { text }
nameservers =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/src/lan/address.ycp new/yast2-network-2.17.23/src/lan/address.ycp
--- old/yast2-network-2.17.20/src/lan/address.ycp 2008-08-04 13:24:52.000000000 +0200
+++ new/yast2-network-2.17.23/src/lan/address.ycp 2008-09-05 14:35:08.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 49627 2008-08-04 11:24:52Z mzugec $
+ * $Id: address.ycp 50748 2008-09-05 12:35:08Z mzugec $
*/
{
@@ -193,6 +193,7 @@
void enableDisableBootProto(symbol current){
UI::ChangeWidget(`dyn, `Enabled, current==`dynamic);
+ UI::ChangeWidget(`dhcp_mode, `Enabled, current==`dynamic);
UI::ChangeWidget(`ipaddr, `Enabled, current==`static);
UI::ChangeWidget(`netmask, `Enabled, current==`static);
UI::ChangeWidget(`hostname, `Enabled, current==`static);
@@ -214,6 +215,13 @@
UI::ChangeWidget(`id(`hostname), `Value, settings["HOSTNAME"]:"");
break;
case "dhcp" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
+ UI::ChangeWidget(`id(`dhcp_mode), `Value, `dhcp_both);
+ break;
+ case "dhcp4" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
+ UI::ChangeWidget(`id(`dhcp_mode), `Value, `dhcp_v4);
+ break;
+ case "dhcp6" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
+ UI::ChangeWidget(`id(`dhcp_mode), `Value, `dhcp_v6);
break;
case "dhcp+autoip" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
UI::ChangeWidget(`id(`dyn), `Value, `dhcp_auto);
@@ -259,7 +267,15 @@
settings["HOSTNAME"]=(string)UI::QueryWidget(`hostname, `Value);
break;
default : switch ((symbol)UI::QueryWidget(`dyn, `Value)){
- case `dhcp: settings["BOOTPROTO"]="dhcp";
+ case `dhcp:
+ switch((symbol)UI::QueryWidget(`dhcp_mode, `Value)){
+ case `dhcp_both : settings["BOOTPROTO"]="dhcp";
+ break;
+ case `dhcp_v4 : settings["BOOTPROTO"]="dhcp4";
+ break;
+ case `dhcp_v6 : settings["BOOTPROTO"]="dhcp6";
+ break;
+ }
break;
case `dhcp_auto: settings["BOOTPROTO"]="dhcp+autoip";
break;
@@ -474,13 +490,16 @@
_("IP Address"),
/* Table header label */
_("Netmask")), []),
- `HBox(
+ `Left(
+ `HBox(
/* PushButton label */
`PushButton(`id(`add), _("Ad&d")),
/* PushButton label */
`PushButton(`id(`edit), `opt(`disabled), _("&Edit")),
/* PushButton label */
- `PushButton(`id(`delete), `opt(`disabled), _("De&lete"))),
+ `PushButton(`id(`delete), `opt(`disabled), _("De&lete"))
+ )
+ ),
`VSpacing(0.49)
),
`HSpacing(3))),
@@ -610,6 +629,11 @@
`item(`id(`dhcp), "DHCP"),
`item(`id(`dhcp_auto), "DHCP+Zeroconf"),
`item(`id(`auto), "Zeroconf")
+ ]),
+ `ComboBox(`id(`dhcp_mode), "", [
+ `item(`id(`dhcp_both), _("DHCP both version 4 and 6")),
+ `item(`id(`dhcp_v4), _("DHCP version 4 only")),
+ `item(`id(`dhcp_v6), _("DHCP version 6 only"))
])
)),
`VBox(
@@ -755,7 +779,7 @@
}
// FIXME duplicated in hardware.ycp
- list<string> device_types = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond", "vlan", "br", "tun", "tap" ];
+ list<string> device_types = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond", "vlan", "br", "tun", "tap", "ib" ];
if(Arch::s390 ())
device_types = [ "eth", "tr", "hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs", "vlan", "br", "tun", "tap" ];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.20/src/lan/cmdline.ycp new/yast2-network-2.17.23/src/lan/cmdline.ycp
--- old/yast2-network-2.17.20/src/lan/cmdline.ycp 2008-06-20 12:46:01.000000000 +0200
+++ new/yast2-network-2.17.23/src/lan/cmdline.ycp 2008-09-04 12:49:50.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards cmdline handlers
* Authors: Michal Svec
*
- * $Id: cmdline.ycp 48430 2008-06-19 17:04:40Z mzugec $
+ * $Id: cmdline.ycp 50651 2008-09-04 10:49:49Z mzugec $
*/
{
@@ -20,18 +20,25 @@
import "LanItems";
import "Map";
-list