Hello community,
here is the log from the commit of package yast2-nis-client
checked in at Mon Sep 29 18:28:21 CEST 2008.
--------
--- yast2-nis-client/yast2-nis-client.changes 2008-09-25 10:32:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-nis-client/yast2-nis-client.changes 2008-09-29 09:59:13.538052000 +0200
@@ -1,0 +2,11 @@
+Mon Sep 29 09:31:32 CEST 2008 - jsuchome@suse.cz
+
+- autoyast API updated for network policy (bnc#429162)
+- 2.17.5
+
+-------------------------------------------------------------------
+Fri Sep 26 11:01:04 CEST 2008 - ug@suse.de
+
+- rnc file fixed
+
+-------------------------------------------------------------------
Old:
----
yast2-nis-client-2.17.4.tar.bz2
New:
----
yast2-nis-client-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nis-client.spec ++++++
--- /var/tmp/diff_new_pack.Mu9535/_old 2008-09-29 18:28:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Mu9535/_new 2008-09-29 18:28:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nis-client (Version 2.17.4)
+# spec file for package yast2-nis-client (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-nis-client
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nis-client-2.17.4.tar.bz2
+Source0: yast2-nis-client-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-pam yast2-testsuite
Requires: yast2 yast2-pam
@@ -50,7 +50,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-nis-client-2.17.4
+%setup -n yast2-nis-client-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,6 +92,11 @@
/usr/share/YaST2/schema/autoyast/rnc/nis.rnc
%doc %{prefix}/share/doc/packages/yast2-nis-client
%changelog
+* Mon Sep 29 2008 jsuchome@suse.cz
+- autoyast API updated for network policy (bnc#429162)
+- 2.17.5
+* Fri Sep 26 2008 ug@suse.de
+- rnc file fixed
* Thu Sep 25 2008 jsuchome@suse.cz
- reset netconfig settings before reading (bnc#427630)
- 2.17.4
++++++ yast2-nis-client-2.17.4.tar.bz2 -> yast2-nis-client-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/src/nis.rnc new/yast2-nis-client-2.17.5/src/nis.rnc
--- old/yast2-nis-client-2.17.4/src/nis.rnc 2006-10-26 15:25:47.000000000 +0200
+++ new/yast2-nis-client-2.17.5/src/nis.rnc 2008-09-29 09:30:50.000000000 +0200
@@ -1,7 +1,7 @@
nis =
element nis {
element start_nis { BOOLEAN }? &
- element nis_by_dhcp {BOOLEAN }? &
+ element netconfig_policy {BOOLEAN }? &
nis_domain? & # may be set by dhcp
nis_servers? &
nis_broadcast? &
@@ -17,7 +17,10 @@
element nis_local_only { BOOLEAN }? &
element nis_options { text }? &
- element start_autofs { BOOLEAN }?
+ element start_autofs { BOOLEAN }? &
+ element slp_domain {
+ Anything?
+ }?
}
nis_domain =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/src/Nis.ycp new/yast2-nis-client-2.17.5/src/Nis.ycp
--- old/yast2-nis-client-2.17.4/src/Nis.ycp 2008-09-25 10:19:11.000000000 +0200
+++ new/yast2-nis-client-2.17.5/src/Nis.ycp 2008-09-25 14:58:34.000000000 +0200
@@ -13,7 +13,7 @@
* Dan Vesely
* Martin Vidner
*
- * $Id: Nis.ycp 51260 2008-09-18 08:45:59Z jsuchome $
+ * $Id: Nis.ycp 51503 2008-09-25 11:11:16Z jsuchome $
*
*/
@@ -111,8 +111,6 @@
global map slp_domain = $[];
- global boolean manual = false;
-
// netconfig policy
global string policy = "auto";
@@ -628,6 +626,9 @@
required_packages = (list <string>)
union (required_packages, ["autofs", "nfs-client"]);
+ policy = settings["netconfig_policy"]:policy;
+ slp_domain = settings["slp_domain"]:slp_domain;
+
touched = true;
}
@@ -703,13 +704,14 @@
"nis_other_domains": other_domains,
- //"nis_by_dhcp": dhcp_wanted,
-
"nis_local_only": local_only,
"nis_broken_server": broken_server,
"nis_options": options,
"start_autofs": _start_autofs,
+
+ "slp_domain" : slp_domain,
+ "netconfig_policy" : policy,
];
}
@@ -818,8 +820,6 @@
global define string ShortSummary() ``{
string summary = "";
- // summary value, used in "Servers: by DHCP" or "Domain: by DHCP"
- string dhcp = _("by DHCP");
string nc = Summary::NotConfigured ();
summary =
// summary item
@@ -1108,7 +1108,7 @@
}
SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME,
- manual? "no" : "yes");
+ policy == "" ? "no" : "yes");
if (! SCR::Write (.sysconfig.network.dhcp, nil))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/src/ui.ycp new/yast2-nis-client-2.17.5/src/ui.ycp
--- old/yast2-nis-client-2.17.4/src/ui.ycp 2008-09-16 16:14:21.000000000 +0200
+++ new/yast2-nis-client-2.17.5/src/ui.ycp 2008-09-25 13:10:33.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: ui.ycp 51185 2008-09-16 14:14:30Z jsuchome $
+ * $Id: ui.ycp 51503 2008-09-25 11:11:16Z jsuchome $
*
* All user interface functions.
*
@@ -384,13 +384,13 @@
//UI::ChangeWidget (`id (`custompolicy), `Enabled, yp_client);
UI::ChangeWidget (`id (`autofs), `Enabled, yp_client);
- Nis::manual = ((symbol) UI::QueryWidget (`id (`policy), `Value) == `nomodify);
- UI::ChangeWidget (`id (`domain), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`servers), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`broadcast), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`find), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`edit), `Enabled, !Nis::manual && yp_client);
- UI::ChangeWidget (`id (`adddomains), `Enabled, !Nis::manual && yp_client);
+ boolean manual = (UI::QueryWidget(`id(`policy),`Value)== `nomodify);
+ UI::ChangeWidget (`id (`domain), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`servers), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`broadcast), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`find), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`edit), `Enabled, !manual && yp_client);
+ UI::ChangeWidget (`id (`adddomains), `Enabled,!manual && yp_client);
if (result == `policy)
{
@@ -472,7 +472,7 @@
servers = (string) UI::QueryWidget (`id (`servers), `Value);
default_broadcast = (boolean) UI::QueryWidget (`id (`broadcast), `Value);
- if (yp_client && !Nis::manual &&
+ if (yp_client && !manual &&
domain != "" &&
!Nis::check_nisdomainname (domain))
{
@@ -485,7 +485,7 @@
list<string> temp_ad = filter (
string a, splitstring (servers, " "), ``(a != ""));
- if (yp_client && !Nis::manual && !default_broadcast &&
+ if (yp_client && !manual && !default_broadcast &&
servers != "" &&
(size (temp_ad) == 0 || find (string a, temp_ad,
``(!Nis::check_address_nis (a))) != nil
@@ -1078,7 +1078,7 @@
* It is done only after read.
*/
define void FitIntoSingle () ``{
- if (!Nis::manual && Nis::dhcpcd_running)
+ if (Nis::policy != "" && Nis::dhcpcd_running)
{
string d = Nis::GetDomain ();
if (size (Nis::multidomain_servers) == 1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.out new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.out
--- old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.out 2008-09-18 10:39:05.000000000 +0200
+++ new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.out 2008-09-29 09:38:20.000000000 +0200
@@ -1,8 +1,8 @@
-Dump DHCP off
+Dump no policy
Read .init.scripts.exists "ypbind" true
Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .sysconfig.network.config.NETCONFIG_NIS_POLICY nil
-Dir .sysconfig.network.config: []
+Read .sysconfig.network.config.NETCONFIG_NIS_POLICY ""
+Dir .sysconfig.network.config: ["NETCONFIG_NIS_POLICY"]
Execute .target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
Execute .target.bash "ls /var/run/dhcpcd-*.pid" 0
Read .sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
@@ -45,7 +45,7 @@
Write .sysconfig.ypbind.YPBIND_BROKEN_SERVER "no" true
Write .sysconfig.ypbind.YPBIND_OPTIONS "" true
Write .sysconfig.ypbind nil true
-Write .sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME "yes" true
+Write .sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME "no" true
Write .sysconfig.network.dhcp nil true
Read .etc.nsswitch_conf."passwd" "compat"
Write .etc.nsswitch_conf."passwd_compat" nil true
@@ -87,11 +87,11 @@
Read .init.scripts.exists "SuSEfirewall2_init" true
Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
Return true
-Dump DHCP on
+Dump auto policy
Read .init.scripts.exists "ypbind" true
Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .sysconfig.network.config.NETCONFIG_NIS_POLICY nil
-Dir .sysconfig.network.config: []
+Read .sysconfig.network.config.NETCONFIG_NIS_POLICY "auto"
+Dir .sysconfig.network.config: ["NETCONFIG_NIS_POLICY"]
Execute .target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
Execute .target.bash "ls /var/run/dhcpcd-*.pid" 0
Read .sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
@@ -121,7 +121,7 @@
Read .init.scripts.comment "ypbind" $["autofs":$[], "rpcbind":$[], "ypbind":$[]]
Write .etc.defaultdomain "mydomain" true
Execute .target.remove "/etc/yp.conf.sv" true
-Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "" true
+Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "auto" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN "" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS "" true
Write .sysconfig.network.config nil true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.ycp new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.ycp
--- old/yast2-nis-client-2.17.4/testsuite/tests/readwrite.ycp 2008-09-04 14:52:34.000000000 +0200
+++ new/yast2-nis-client-2.17.5/testsuite/tests/readwrite.ycp 2008-09-29 09:38:06.000000000 +0200
@@ -33,15 +33,6 @@
import "Nis";
- map dhcp_yes = $[
- "DHCLIENT_MODIFY_NIS_CONF": "yes",
- "DHCLIENT_SET_DOMAINNAME": "yes",
- ];
- map dhcp_no = $[
- "DHCLIENT_MODIFY_NIS_CONF": "no",
- "DHCLIENT_SET_DOMAINNAME": "no",
- ];
-
map READ = $[
// Runlevel:
"init": $[
@@ -101,8 +92,10 @@
"YPBIND_OPTIONS": "",
],
"network": $[
- "dhcp": dhcp_no,
+ "config": $[
+ "NETCONFIG_NIS_POLICY" : ""
],
+ ],
"displaymanager": $[
"DISPLAYMANAGER": "kdm",
"DISPLAYMANAGER_AUTOLOGIN": "no",
@@ -129,12 +122,12 @@
],
];
- DUMP ("DHCP off");
+ DUMP ("no policy");
TEST (``(Nis::Read ()), [READ, WRITE, EXECUTE], nil);
TEST (``(Nis::Write ()), [READ, WRITE, EXECUTE], nil);
- DUMP ("DHCP on");
- READ["sysconfig", "network", "dhcp"] = dhcp_yes;
+ DUMP ("auto policy");
+ READ["sysconfig", "network", "config", "NETCONFIG_NIS_POLICY"] = "auto";
TEST (``(Nis::Read ()), [READ, WRITE, EXECUTE], nil);
TEST (``(Nis::Touch (true)), [], nil);
TEST (``(Nis::Write ()), [READ, WRITE, EXECUTE], nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.17.4/VERSION new/yast2-nis-client-2.17.5/VERSION
--- old/yast2-nis-client-2.17.4/VERSION 2008-09-25 10:27:44.000000000 +0200
+++ new/yast2-nis-client-2.17.5/VERSION 2008-09-29 09:31:44.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org