Mailinglist Archive: opensuse-commit (1828 mails)

< Previous Next >
commit yast2-network
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 06 Sep 2008 05:05:08 +0200
  • Message-id: <20080906030508.EC6D2678164@xxxxxxxxxxxxxxx>

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@xxxxxxx
+
+- support for InfiniBand (fate#304870), (fate#304115)
+- 2.17.23
+
+-------------------------------------------------------------------
+Thu Sep 4 16:10:43 CEST 2008 - mzugec@xxxxxxx
+
+- alignment of add/edit/delete (bnc#421037)
+
+-------------------------------------------------------------------
+Thu Sep 4 16:04:09 CEST 2008 - mzugec@xxxxxxx
+
+- alignment of add/edit/delete (bnc#421033)
+
+-------------------------------------------------------------------
+Thu Sep 4 15:18:14 CEST 2008 - mzugec@xxxxxxx
+
+- IPv6 configuration (fate#304397)
+- installation with IPv6 (fate#302926)
+- 2.17.22
+
+-------------------------------------------------------------------
+Thu Sep 4 12:47:25 CEST 2008 - mzugec@xxxxxxx
+
+- fixed yast lan list configured|unconfigured (bnc#420449)
+- 2.17.21
+
+-------------------------------------------------------------------
+Wed Sep 3 10:50:48 CEST 2008 - kmachalkova@xxxxxxx
+
+- 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 <msvec@xxxxxxx>

%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@xxxxxxx
+- support for InfiniBand (fate#304870), (fate#304115)
+- 2.17.23
+* Thu Sep 04 2008 mzugec@xxxxxxx
+- alignment of add/edit/delete (bnc#421037)
+* Thu Sep 04 2008 mzugec@xxxxxxx
+- alignment of add/edit/delete (bnc#421033)
+* Thu Sep 04 2008 mzugec@xxxxxxx
+- IPv6 configuration (fate#304397)
+- installation with IPv6 (fate#302926)
+- 2.17.22
+* Thu Sep 04 2008 mzugec@xxxxxxx
+- fixed yast lan list configured|unconfigured (bnc#420449)
+- 2.17.21
+* Wed Sep 03 2008 kmachalkova@xxxxxxx
+- DNS data configuration adapted to using netconfig (resolv.conf is
+ no longer written directly)(FaTE#303618)
* Mon Aug 18 2008 mzugec@xxxxxxx
- 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 <mzugec@xxxxxxx>"

@@ -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 <mzugec@xxxxxxx>"

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 <msvec@xxxxxxx>
*
- * $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 <msvec@xxxxxxx>
*
- * $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 <msvec@xxxxxxx>
*
- * $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 <msvec@xxxxxxx>
*
- * $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 <map<string, any> > getConfigList(){
+list <map<string, any> > getConfigList(string config_filter){
list <map<string, any> > confList = [];
- //integer count = 0;
+ integer count = -1;
LanItems::BuildLanOverview();
//list<map<string,any> > overview = (list<map<string,any>
)LanItems::Overview();
foreach(integer position,any row, LanItems::Items, {
LanItems::current = position;
- confList = add(confList, $[tostring(size(confList )) : $["id" : position,
+ count = count + 1;
+ if (size(LanItems::getCurrentItem()["ifcfg"]:"")>0)
+ {
+ if (config_filter=="unconfigured") continue;
+ } else {
+ if (config_filter=="configured") continue;
+ }
+
+ confList = add(confList, $[ tostring(count) : $["id" : position,
"rich_descr" :
LanItems::getCurrentItem()["table_descr", "rich_descr"]:"",
"descr" : LanItems::getCurrentItem()["table_descr",
"table_descr", 0]:"",
"addr" : LanItems::getCurrentItem()["table_descr",
"table_descr", 1]:""]]);
-// count = count + 1;
});
return confList;
}
@@ -65,7 +72,7 @@
* @param options action options
*/
define boolean ShowHandler(map<string, string> options) {
- list <map<string, any> > config = getConfigList();
+ list <map<string, any> > config = getConfigList("");
if (validateId(options, config)==false) return false;
foreach(map<string, any> row, config, {
foreach(string key, map<string, any> value, (map<string, map<string, any>
) row, {
@@ -81,7 +88,10 @@
}

define boolean ListHandler(map<string, string> options) {
- foreach(map<string, any> row, getConfigList(), {
+ string config_filter="";
+ if (contains(Map::Keys(options), "configured")) config_filter="configured";
+ if (contains(Map::Keys(options), "unconfigured"))
config_filter="unconfigured";
+ foreach(map<string, any> row, getConfigList(config_filter), {
foreach(string id, map <string,any> detail, (map<string, map<string, any>
)row, {
CommandLine::Print(sformat("%1\t%2, %3\n",id, detail["descr"]:"",
detail["addr"]:""));
});
@@ -127,7 +137,7 @@
* @param options action options
*/
define boolean EditHandler(map<string, string> options) {
- list <map<string, any> > config = getConfigList();
+ list <map<string, any> > config = getConfigList("");

if (validateId(options, config)==false) return false;

@@ -172,7 +182,7 @@
* @param options action options
*/
define boolean DeleteHandler(map<string, string> options) {
- list <map<string, any> > config = getConfigList();
+ list <map<string, any> > config = getConfigList("");
if (validateId(options, config)==false) return false;
foreach(map<string, any> row, config, {
foreach(string key, map<string, any> value, (map<string, map<string, any>
) row, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/lan/help.ycp
new/yast2-network-2.17.23/src/lan/help.ycp
--- old/yast2-network-2.17.20/src/lan/help.ycp 2008-08-05 10:28:13.000000000
+0200
+++ new/yast2-network-2.17.23/src/lan/help.ycp 2008-09-02 13:29:34.000000000
+0200
@@ -81,19 +81,17 @@
_("<p>Enable <b>IP Forwarding</b> if the system is a router.</p>"),

"dhcp_hostname":
-_("<p>If you are using DHCP to get an IP address, check whether you get
-a hostname via DHCP. You can see the hostname of you host using the
<i>hostname</i> command. The hostname
-will be set automatically by the DHCP client.
-Changing the hostname at runtime may confuse the graphical Desktop. Therefore,
disable this option if you connect to different
-networks that assign different hostnames.
-</p>
-"),
+_("<p>If you are using DHCP to get an IP address, check whether to get
+also a hostname via DHCP. The hostname will be set automatically by the DHCP
client.
+However, changing the hostname at runtime may confuse the graphical desktop.
+Therefore, disable this option if you connect to different networks that
assign
+different hostnames.</p> "),

"write_hostname":
-_("<p>If you are using DHCP to get an IP address, your hostname will be written
-to <tt>/etc/hosts</tt> and be resolvable as a <tt>127.0.0.2</tt> IP address.
-This is the default behavior. To disable this option, uncheck this box.
-Now your hostname will not be resolvable without an active network.
+_("<p>Your hostname will be written to <tt>/etc/hosts</tt> and will be
+resolvable as a <tt>127.0.0.2</tt> IP address. This is the default behavior.
+To disable such option, uncheck <b>Write Hostname to /etc/hosts</b> box.
+In that case your hostname will not be resolvable without an active network.
</p>
"),

@@ -111,27 +109,27 @@
The primary search domain is usually the same as the domain name of
your computer (for example, suse.de). There may be additional search domains
(such as suse.com). Separate the domains with commas or white space.</p>
-") +
- // resolver dialog help
- _("<p>If you plan to use a dial-up Internet connection and have set up your
-connection to use dynamic DNS assignment, these values will be temporarily
-disabled during the connection.</p>"),
+"),

"hostname_global":
-_("<p>Optionally enter the name server list and domain search list.</p>")
-+ _("<p>Note that the hostname is global--it applies to all
-interfaces, not just this one.</p>"),
-
-"modify_resolv_popup":
- /* Warning popup text 1/2 */
-_("<p>The resolver configuration file (/etc/resolv.conf)
-has been temporarily modified by %1. You have two options:</p>") +
-
- /* Warning popup text 2/2 */
- _("<p>Modify the current version of the file.</p>
-<p>Press <b>Accept</b> and continue editing other data. You are able to return
to this dialog at a later time,
-when the above service has terminated.</p>
-"),
+_("<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the
DNS domain
+(e.g. <i>example.com</i>) that it belongs to. The domain is especially
important if this
+computer is a mail server. You can view the hostname of you computer using the
<i>hostname</i>
+command.</p>"),
+
+"dns_config_policy" :
+_("<p>Select the way how DNS configuration (name servers, search list, the
content of
+<i>/etc/resolv.conf</i> file) will be modified. Normally, it is handled by
<i>netconfig</i>
+script which merges the data statically defined here with those obtained
dynamically (e.g. from
+DHCP client, NetworkManager etc.). This is the default, <b>Use Default
Policy</b> option and
+it is sufficient for most of the configurations.</p>") +
+
+_("<p>By choosing <b>Only Manually</b> option, <i>netconfig</i> will no longer
be allowed to modify
+<i>/etc/resolv.conf</i>. You can however edit the file manually. By choosing
<b>Use Custom Policy</b>
+option, you may specify a custom policy string, which consists of
comma-separated list of interface
+names, including wildcards, with STATIC and STATIC_FALLBACK as predefined
special values. For more
+information, see <i>netconfig</i> manual page. Note: leaving the field blank
is the same as using <b>
+Only Manually</b> policy.</p>"),

"bootproto":
/* Address dialog help 1-6/8: dynamic address preferred */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/modules/DNS.ycp
new/yast2-network-2.17.23/src/modules/DNS.ycp
--- old/yast2-network-2.17.20/src/modules/DNS.ycp 2008-06-02
16:20:00.000000000 +0200
+++ new/yast2-network-2.17.23/src/modules/DNS.ycp 2008-09-03
09:32:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: DNS.ycp 47991 2008-06-02 14:19:59Z mzugec $
+ * $Id: DNS.ycp 50563 2008-09-02 11:39:14Z aschnell $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -50,6 +50,8 @@
global string resolv_conf_process = "";
global boolean resolv_conf_force = false;

+global string resolv_conf_policy = "";
+
// fully qualified
string oldhostname = "";

@@ -137,38 +139,15 @@
// bogus?!
y2milestone ("install.inf: %1", install_inf);

- /* check for externally modified resolv.conf */
- if(SCR::Execute(.target.bash, "/sbin/modify_resolvconf check -q <
/dev/null") != 0)
- resolv_conf_process = (string) SCR::Read(.etc.resolv_conf.process);
- else
- {
- resolv_conf_process = "";
+ resolv_conf_policy =
(string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_POLICY);
+ list<string> resolvlist =
splitstring((string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS),
" ");
+ if(resolvlist == nil) {
+ ReadNameserver (install_inf["Nameserver"]:"");
}
+ else
+ nameservers = resolvlist;

- /* only read /etc/resolv.conf if present */
- if(SCR::Read(.target.size, resolv_conf) > 0) {
-
- /* name servers */
- list<string> resolvlist = (list<string>)
SCR::Read(.etc.resolv_conf.nameserver);
- if(resolvlist == nil) {
- ReadNameserver (install_inf["Nameserver"]:"");
- }
- else
- nameservers = resolvlist;
-
- /* search list */
- resolvlist = (list<string>) SCR::Read(.etc.resolv_conf.search);
- if(resolvlist != nil) searchlist = resolvlist;
- if(size(searchlist) < 1) {
- string dom = (string) SCR::Read(.etc.resolv_conf.domain);
- if(dom != nil && dom != "") searchlist = [ dom ];
- }
- }
- else {
- /* FIXME: propose DNS from Detection */
- nameservers = [];
- searchlist = [];
- }
+ searchlist =
splitstring((string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST),
" ");

/* hostname and domain */
// all this is much too intelligent and belongs rather to the proposal
@@ -303,32 +282,23 @@
/* update X authorization */
SCR::Write(.xauth.key, xauth_key);

+ /*
if(SCR::Read(.target.size, resolv_conf) < 0)
SCR::Write(.target.string, resolv_conf, "");
-
+ */
+
if( update_resolv ) {

/* Progress step 3/3 */
ProgressNextStage(_("Updating /etc/resolv.conf ..."));

- /* update /etc/resolv.conf */
- SCR::Write(.etc.resolv_conf.search, searchlist);
- SCR::Write(.etc.resolv_conf.nameserver, nameservers);
- /* update domain in /etc/resolv.conf */
- if(size(searchlist) > 0)
- SCR::Write(.etc.resolv_conf.domain, "");
- else
- SCR::Write(.etc.resolv_conf.domain, domain);
-
- /* write only an original header */
- if(resolv_conf_force == true &&
- (NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false ==
true)) {
- SCR::Write(.etc.resolv_conf.write_header, true);
- }
+ SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_POLICY,
resolv_conf_policy);
+ SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST,
mergestring(searchlist, " "));
+ SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS,
mergestring(nameservers, " "));
+ SCR::Write(.sysconfig.network.config, nil);

- /* flush the cache */
- SCR::Write(.etc.resolv_conf, nil);
- SCR::Execute(.target.bash, "/bin/chmod a+r /etc/resolv.conf");
+ SCR::Execute(.target.bash, "/sbin/netconfig update");
+
sleep(sl);

} else y2milestone("resolv.conf changed by %1, leave untouched",
resolv_conf_process);
@@ -350,6 +320,8 @@
domain = settings["domain"]:"";
nameservers = (list<string>) eval(settings["nameservers"]:[]);
searchlist = (list<string>) eval(settings["searchlist"]:[]);
+ //if not defined, set to 'auto'
+ resolv_conf_policy = settings["resolv_conf_policy"]:"auto";
modified = true;
initialized = true;
return true;
@@ -369,6 +341,8 @@
expdns["nameservers"] = eval(nameservers);
if (size(searchlist) >0)
expdns["searchlist"] = eval(searchlist);
+ //TODO: test if it really works with empty string
+ expdns["resolv_conf_policy"] = resolv_conf_policy;
return expdns;
}

@@ -392,13 +366,14 @@
if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false)
summary = Summary::AddListItem(summary, _("Hostname will not be written
to /etc/hosts"));

- if (has_dhcp && NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false) {
+
+ /*if (has_dhcp &&
NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false) {*/
/* Summary text */
- summary = Summary::AddListItem(summary, _("Name Servers: Set by DHCP"));
+ /*summary = Summary::AddListItem(summary, _("Name Servers: Set by
DHCP")); */
/* Summary text */
- summary = Summary::AddListItem(summary, _("Search List: Set by DHCP"));
- }
- else {
+ /*summary = Summary::AddListItem(summary, _("Search List: Set by
DHCP")); */
+ /*}*/
+ /*else {*/
list<string> nslist = maplist(string ns, nameservers, {
string nss = NetHwDetection::ResolveIP(ns);
return (nss == "") ? ns : (ns + " (" + nss + ")");
@@ -410,7 +385,7 @@
if(size(searchlist) > 0)
/* Summary text */
summary = Summary::AddListItem(summary, sformat(_("Search List:
%1"), mergestring(searchlist, ", ")));
- }
+ /*}*/

if(size(summary) < 1) return "";
return "<ul>" + summary + "</ul>";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/modules/LanItems.ycp
new/yast2-network-2.17.23/src/modules/LanItems.ycp
--- old/yast2-network-2.17.20/src/modules/LanItems.ycp 2008-08-04
12:06:18.000000000 +0200
+++ new/yast2-network-2.17.23/src/modules/LanItems.ycp 2008-09-04
14:44:29.000000000 +0200
@@ -462,8 +462,8 @@
if (ip != "NONE")
{
string prefixlen =
NetworkInterfaces::Current["PREFIXLEN"]:"";
- string descr = _("IP address assigned using DHCP");
- if (ip != "DHCP") descr=(size(prefixlen)>0) ?
+ string descr = sformat("%1 %2", _("IP address assigned
using"), ip);
+ if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ?
sformat(_("IP address: %1/%2"), ip, prefixlen)
:
sformat(_("IP address: %1, subnet mask %2")
, ip,
NetworkInterfaces::Current["NETMASK"]:"");
@@ -1013,7 +1013,6 @@
* @return true if success
*/
global define boolean Commit() {
-y2internal("name %1, current %2", NetworkInterfaces::Name,
NetworkInterfaces::Current);
if(operation == `add || operation == `edit) {
map<string,any> newdev = $[];

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/modules/NetHwDetection.ycp
new/yast2-network-2.17.23/src/modules/NetHwDetection.ycp
--- old/yast2-network-2.17.20/src/modules/NetHwDetection.ycp 2008-06-13
17:20:39.000000000 +0200
+++ new/yast2-network-2.17.23/src/modules/NetHwDetection.ycp 2008-09-03
15:31:11.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network detection
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: NetHwDetection.ycp 48310 2008-06-13 15:20:40Z mzugec $
+ * $Id: NetHwDetection.ycp 50620 2008-09-03 13:31:11Z mzugec $
*
* <p>Detects network settings, using dhcp or sniffing network traffic</p>
*
@@ -121,8 +121,12 @@
list<string> interfaces = filter(string s, splitstring(output["stdout"]:"",
"\n"), {return (size(s)>0);});
y2internal("output %1", interfaces);
foreach(string ifc, interfaces, {
- y2milestone("Setting up interface %1", ifc);
- SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc));
+// TODO: do some tests before uncomment block bellow
+// if ((integer)SCR::Execute(.target.bash, sformat("ip link show %1|head
-n1|grep -q \"[^[:alpha:]]UP[^[:alpha:]]\"", ifc))!=0)
+// {
+ y2milestone("Setting link up for interface %1", ifc);
+ SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc));
+// } else y2milestone("Link for %1 interface is already up, do nothing",
ifc);
});
} else y2error("Error while execute %1 : %2", command, output);

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/routines/routines.ycp
new/yast2-network-2.17.23/src/routines/routines.ycp
--- old/yast2-network-2.17.20/src/routines/routines.ycp 2008-07-08
10:13:46.000000000 +0200
+++ new/yast2-network-2.17.23/src/routines/routines.ycp 2008-09-05
14:35:08.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: routines.ycp 48737 2008-07-01 15:53:37Z mzugec $
+ * $Id: routines.ycp 50748 2008-09-05 12:35:08Z mzugec $
*/

{
@@ -473,6 +473,7 @@
else if(subclass_id == 2) return "fddi";
else if(subclass_id == 3) return "atm";
else if(subclass_id == 4) return "isdn";
+ else if(subclass_id == 6) return "ib";
else if(subclass_id == 0x81) return "myri";
else if(subclass_id == 0x82) return "wlan";
else if(subclass_id == 0x83) return "xp";
@@ -497,6 +498,11 @@
}

}
+ // exception for infiniband device
+ if(hwdevice["class_id"]:-1 == 12) {
+ if(subclass_id == 6) return "ib";
+ }
+
/* Communication controller */
if(hwdevice["class_id"]:-1 == 7) {
if(subclass_id == 3) return "modem";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/services/dns.ycp
new/yast2-network-2.17.23/src/services/dns.ycp
--- old/yast2-network-2.17.20/src/services/dns.ycp 2008-04-21
12:32:10.000000000 +0200
+++ new/yast2-network-2.17.23/src/services/dns.ycp 2008-09-02
13:29:34.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: dns.ycp 46855 2008-04-18 13:48:54Z jsrain $
+ * $Id: dns.ycp 50534 2008-09-01 15:57:25Z kmachalkova $
*/

{
@@ -70,8 +70,7 @@
"DOMAIN": DNS::domain,
"DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false,
// set as true by default because there wasn't this option in previous
version
- "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true,
- "DHCP_RESOLV": NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false,
+ "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true
];
// the rest is not so straightforward,
// because we have list variables but non-list widgets
@@ -79,7 +78,7 @@
/* domain search */
string searchstring = mergestring (DNS::searchlist, "\n");
// #49094: populate the search list
- if (searchstring == "" && !settings["DHCP_RESOLV"]:false)
+ if (searchstring == "")
{
searchstring = settings["DOMAIN"]:"";
}
@@ -109,8 +108,7 @@
DNS::searchlist = NonEmpty (searchlist);
NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] =
settings["DHCP_HOSTNAME"]:false;
NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] =
settings["WRITE_HOSTNAME"]:true;
- NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"] =
settings["DHCP_RESOLV"]:false;
- if ((boolean)UI::QueryWidget(`id("MODIFY_RESOLV"), `Value))
DNS::resolv_conf_process="";
+
/* update modified flag */
DNS::modified = true;
y2milestone("modified DNS");
@@ -154,19 +152,6 @@
}

/**
- * Event handler for DHCP_RESOLV checkbox.
- * enable or disable: is DHCP available and not used now? HUH?!
- * @param key the widget receiving the event
- * @param event the event being handled
- * @return nil so that the dialog loops on
- */
-define symbol HandleDhcpResolv (string key, map event) {
- UI::ChangeWidget (`id ("DHCP_RESOLV"), `Enabled, has_dhcp &&
resolver_modifiable);
- if (!has_dhcp) UI::ReplaceWidget(`id ("dh_resolv_text"),`Label(_("No
interface with dhcp")));
- return nil;
-}
-
-/**
* Event handler for resolver data (nameservers, searchlist)
* enable or disable: is DHCP available?
* @param key the widget receiving the event
@@ -174,9 +159,7 @@
* @return nil so that the dialog loops on
*/
define symbol HandleResolverData (string key, map event) {
- boolean dhcp_resolv = (boolean) UI::QueryWidget (`id ("DHCP_RESOLV"),
`Value);
- dhcp_resolv = dhcp_resolv && has_dhcp; // #146162
- UI::ChangeWidget (`id (key), `Enabled, resolver_modifiable &&
(!dhcp_resolv));
+ UI::ChangeWidget (`id (key), `Enabled, resolver_modifiable);
return nil;
}

@@ -258,28 +241,77 @@
}


-void initModifyResolv (string key){
- string process = DNS::resolv_conf_process;
- if(process == nil || process == "") {
- resolver_modifiable = true;
- UI::ChangeWidget(`id("MODIFY_RESOLV"), `Enabled, false);
- } else {
- resolver_modifiable = false;
- }
- DNS::resolv_conf_force = resolver_modifiable;
+void initPolicy(string key) {
+
+ y2milestone("initPolicy: %1", UI::QueryWidget(`id("MODIFY_RESOLV"),
`Value));
+
+ if(UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `custom)
+ {
+ UI::ChangeWidget(`id("PLAIN_POLICY"), `Enabled, true);
+ if (UI::QueryWidget(`id("PLAIN_POLICY"), `Value) == "")
+ {
+ UI::ChangeWidget(`id("PLAIN_POLICY"), `Value,
DNS::resolv_conf_policy);
+ }
+ }
+ else
+ {
+ UI::ChangeWidget(`id("PLAIN_POLICY"), `Value, "");
+ UI::ChangeWidget(`id("PLAIN_POLICY"), `Enabled, false);
+ }
}

-symbol handleModifyResolv (string key, map event){
- if ((boolean)UI::QueryWidget(`id("MODIFY_RESOLV"), `Enabled))
- {
- if ((boolean)UI::QueryWidget(`id("MODIFY_RESOLV"), `Value))
- {
- resolver_modifiable = true;
- } else {
- resolver_modifiable = false;
+symbol handlePolicy(string key, map event) {
+
+ y2milestone("handlePolicy");
+
+ if(UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `custom)
+ {
+ DNS::resolv_conf_policy =
(string)UI::QueryWidget(`id("PLAIN_POLICY"), `Value);
+ }
+ else if(UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `auto)
+ {
+ DNS::resolv_conf_policy = "auto";
+ }
+ else
+ {
+ DNS::resolv_conf_policy = "";
}
- }
- return nil;
+}
+
+void initModifyResolvPolicy (string key){
+
+ y2milestone("initModifyResolvPolicy");
+
+ if(DNS::resolv_conf_policy == nil || DNS::resolv_conf_policy == "")
+ {
+ UI::ChangeWidget(`id("MODIFY_RESOLV"), `Value, `id(`nomodify) );
+ }
+ else if(DNS::resolv_conf_policy == "auto" || DNS::resolv_conf_policy ==
"STATIC *")
+ {
+ UI::ChangeWidget(`id("MODIFY_RESOLV"), `Value, `id(`auto) );
+ }
+ else
+ {
+ UI::ChangeWidget(`id("MODIFY_RESOLV"), `Value, `id(`custom) );
+ }
+}
+
+symbol handleModifyResolvPolicy (string key, map event){
+ y2milestone("handleModifyResolvPolicy called: %1",
UI::QueryWidget(`id("MODIFY_RESOLV"), `Value));
+
+ if (UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `nomodify)
+ {
+ resolver_modifiable = false;
+ }
+ else
+ {
+ resolver_modifiable = true;
+ }
+
+ initPolicy(key);
+
+ y2milestone("Exit: resolver_modifiable = %1", resolver_modifiable);
+ return nil;
}


@@ -311,9 +343,7 @@
/* textentry label */
"label": Label::HostName (),
"opt": [],
- "help":
- // help
-_("<p>Enter the name for this computer and the DNS domain that it belongs
to.</p>"),
+ "help": help["hostname_global"]:"",
"valid_chars": Hostname::ValidChars,
"validate_type": `function_no_popup,
"validate_function": ValidateHostname,
@@ -323,7 +353,6 @@
"HOSTNAME_GLOBAL": $[
"widget": `empty,
// #91202
- "help": help["hostname_global"]:"",
"init": initHostnameGlobal,
"store": storeHostnameGlobal
],
@@ -332,7 +361,6 @@
/* textentry label */
"label": _("&Domain Name"),
"opt": [],
- "help": _("<p>The domain is especially important if this computer is a
mail server.</p>"),
// Do nothing (the widget doesnt have notify anyway)
// In particular do not disable the host and domain name widgets,
// setting of FQDN should be possible even if DHCP overrides it.
@@ -363,14 +391,28 @@
// help
"help": help["write_hostname"]:"",
],
- "MODIFY_RESOLV" : $[
- "widget": `checkbox,
- "label" : _("&Change /etc/resolv.conf manually"),
- "opt" : [`notify],
- "init" : initModifyResolv,
- "handle": handleModifyResolv,
- "help" : ""
- ],
+ "MODIFY_RESOLV" : $[
+ "widget": `combobox,
+ "label": _("&Modify DNS
configuration"),
+ "opt" : [`notify],
+ "items": [ [`nomodify, _("Only
Manually")],
+ [`auto, _("Use
Default Policy")],
+ [`custom, _("Use
Custom Policy")] ],
+ "init" : initModifyResolvPolicy,
+ "handle":
handleModifyResolvPolicy,
+ "help" :
help["dns_config_policy"]:"",
+ ],
+ "PLAIN_POLICY" : $[
+ "widget": `combobox,
+ "label": _("&Custom Policy Rule"),
+ "opt" : [`editable],
+ "items" : [ [`static, "STATIC"],
+ [`static_fallback,
"STATIC_FALLBACK" ]
+ ],
+ "init": initPolicy,
+ "handle": handlePolicy,
+ "help" : ""
+ ],
"NAMESERVER_1": $[
"widget": `textentry,
/* textentry label */
@@ -397,16 +439,6 @@
"validate_type": `function,
"validate_function": ValidateSearchList,
],
- "DHCP_RESOLV": $[
- "widget": `custom,
- "custom_widget" : `HBox(
- `CheckBox(`id("DHCP_RESOLV"), `opt(`notify), _("&Update DNS data via
DHCP")),
- `ReplacePoint( `id("dh_resolv_text"), `Empty() )
- ),
- // help
- "help": "", // at "SEARCHLIST_S"
- "handle": HandleDhcpResolv,
- ],
];

widget_descr_dns["NAMESERVER_2"] = widget_descr_dns["NAMESERVER_1"]:$[];
@@ -432,7 +464,11 @@
`Left("WRITE_HOSTNAME")
)),
`VSpacing(0.49),
- `Left("MODIFY_RESOLV"),
+ `Left( `HBox(
+ "MODIFY_RESOLV",
+ `HSpacing (1),
+ "PLAIN_POLICY"
+ ) ),
/* Frame label */
`Frame(_("Name Servers and Domain Search List"), `VBox(
`VSquash ( `HBox(
@@ -444,9 +480,7 @@
`HSpacing (1),
`HWeight (1, "SEARCHLIST_S")
)),
- `VSpacing(0.49),
- /* CheckBox label */
- `Left ("DHCP_RESOLV")
+ `VSpacing(0.49)
)
),
`VStretch()
@@ -456,8 +490,8 @@
"resolv" : $[
"header" : _("Hostname/DNS"),
"contents" : dns_contents,
- "widget_names" : ["HOSTNAME", "HOSTNAME_GLOBAL", "DOMAIN",
"DHCP_HOSTNAME", "WRITE_HOSTNAME", "MODIFY_RESOLV",
- "NAMESERVER_1", "NAMESERVER_2", "NAMESERVER_3",
"SEARCHLIST_S", "DHCP_RESOLV"]
+ "widget_names" : ["HOSTNAME", "HOSTNAME_GLOBAL", "DOMAIN",
"DHCP_HOSTNAME", "WRITE_HOSTNAME", "MODIFY_RESOLV", "PLAIN_POLICY",
+ "NAMESERVER_1", "NAMESERVER_2", "NAMESERVER_3",
"SEARCHLIST_S"]
]
];

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/src/services/host.ycp
new/yast2-network-2.17.23/src/services/host.ycp
--- old/yast2-network-2.17.20/src/services/host.ycp 2008-06-05
14:11:25.000000000 +0200
+++ new/yast2-network-2.17.23/src/services/host.ycp 2008-09-04
16:11:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hosts configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: host.ycp 48093 2008-06-05 12:11:25Z mzugec $
+ * $Id: host.ycp 50698 2008-09-04 14:11:19Z mzugec $
*
* Hosts configuration dialogs
*/
@@ -104,13 +104,16 @@
_("Hostnames"),
/* Table header label */
_("Host Aliases")), []),
- `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(1)
), `HSpacing(3))),
`VSpacing(2)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.17.20/VERSION
new/yast2-network-2.17.23/VERSION
--- old/yast2-network-2.17.20/VERSION 2008-08-18 09:03:51.000000000 +0200
+++ new/yast2-network-2.17.23/VERSION 2008-09-05 14:33:59.000000000 +0200
@@ -1 +1 @@
-2.17.20
+2.17.23


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >