Hello community,
here is the log from the commit of package yast2-nfs-client for openSUSE:Factory
checked in at Fri Feb 5 14:27:38 CET 2010.
--------
--- yast2-nfs-client/yast2-nfs-client.changes 2010-01-19 10:27:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2010-02-04 15:04:29.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Feb 4 14:52:27 CET 2010 - kmachalkova@suse.cz
+
+- New structure of <nfs> section of AY profiles to allow setting up
+ global vars (bnc#457981)
+- Some style fixes - use ButtonBoxes, use OK-Cancel dialog
+ (bnc#571958)
+- 2.19.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-nfs-client-2.19.0.tar.bz2
New:
----
yast2-nfs-client-2.19.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.ow7W6C/_old 2010-02-05 14:26:54.000000000 +0100
+++ /var/tmp/diff_new_pack.ow7W6C/_new 2010-02-05 14:26:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nfs-client (Version 2.19.0)
+# spec file for package yast2-nfs-client (Version 2.19.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-nfs-client
-Version: 2.19.0
+Version: 2.19.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nfs-client-2.19.0.tar.bz2
+Source0: yast2-nfs-client-2.19.1.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -46,7 +46,7 @@
file system access. It allows access to files on remote machines.
%prep
-%setup -n yast2-nfs-client-2.19.0
+%setup -n yast2-nfs-client-2.19.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-nfs-client-2.19.0.tar.bz2 -> yast2-nfs-client-2.19.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/nfs_auto.ycp new/yast2-nfs-client-2.19.1/src/nfs_auto.ycp
--- old/yast2-nfs-client-2.19.0/src/nfs_auto.ycp 2009-07-21 16:37:57.000000000 +0200
+++ new/yast2-nfs-client-2.19.1/src/nfs_auto.ycp 2010-02-04 15:04:09.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: nfs_auto.ycp 20632 2005-01-03 12:54:47Z mvidner $
+ * $Id: nfs_auto.ycp 60697 2010-02-04 14:04:09Z kmachalkova $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -37,13 +37,15 @@
any ret = nil;
string func = "";
-list<map> param = [];
+map param = $[];
/* Check arguments */
if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
func = (string) WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = ( map ) WFM::Args(1);
if(size(WFM::Args()) > 1 && is(WFM::Args(1), list))
- param = (list<map>) WFM::Args(1);
+ y2warning("Old-style configuration detected (got list, expected map). <nfs> section needs to be converted to match up-to-date schema");
}
y2debug("func=%1", func);
y2debug("param=%1", param);
@@ -58,8 +60,8 @@
}
/* Reset configuration */
else if (func == "Reset") {
- Nfs::Import([]);
- ret = [];
+ Nfs::Import($[]);
+ ret = $[];
}
/* Change configuration (run AutoSequence) */
else if (func == "Change") {
@@ -80,7 +82,7 @@
}
/* Return actual state */
else if (func == "Export") {
- ret = (list) Nfs::Export();
+ ret = (map) Nfs::Export();
}
else if (func == "Read") {
ret = (boolean) Nfs::Read();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/nfs.desktop new/yast2-nfs-client-2.19.1/src/nfs.desktop
--- old/yast2-nfs-client-2.19.0/src/nfs.desktop 2010-01-14 12:30:13.000000000 +0100
+++ new/yast2-nfs-client-2.19.1/src/nfs.desktop 2010-02-03 20:50:08.000000000 +0100
@@ -15,7 +15,7 @@
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=
-X-SuSE-YaST-AutoInstDataType=list
+X-SuSE-YaST-AutoInstDataType=map
X-SuSE-YaST-AutoInstClonable=true
X-SuSE-YaST-AutoInstRequires=lan
X-SuSE-YaST-AutoInstSchema=nfs.rnc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/nfs.rnc new/yast2-nfs-client-2.19.1/src/nfs.rnc
--- old/yast2-nfs-client-2.19.0/src/nfs.rnc 2009-07-21 16:37:57.000000000 +0200
+++ new/yast2-nfs-client-2.19.1/src/nfs.rnc 2010-02-04 14:17:01.000000000 +0100
@@ -1,10 +1,14 @@
nfs =
element nfs {
- LIST,
- element nfs_entry {
- element server_path { text }
- & element mount_point { text }
- & element vfstype {text}?
- & element nfs_options { text }
- }*
+ element enable_nfs4 { BOOLEAN }? &
+ element idmapd_domain { text }? &
+ element nfs_entries {
+ LIST,
+ element nfs_entry {
+ element server_path { text }
+ & element mount_point { text }
+ & element vfstype {text}?
+ & element nfs_options { text }
+ }*
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/Nfs.ycp new/yast2-nfs-client-2.19.1/src/Nfs.ycp
--- old/yast2-nfs-client-2.19.0/src/Nfs.ycp 2009-07-21 16:37:57.000000000 +0200
+++ new/yast2-nfs-client-2.19.1/src/Nfs.ycp 2010-02-03 20:52:32.000000000 +0100
@@ -13,7 +13,7 @@
* Dan Vesely
* Martin Vidner
*
- * $Id: Nfs.ycp 56674 2009-04-07 15:57:46Z kmachalkova $
+ * $Id: Nfs.ycp 60683 2010-02-03 18:19:18Z kmachalkova $
*/
{
@@ -80,13 +80,33 @@
// list of created directories
list<string> created_dirs = [];
+ boolean ReadNfs4 () {
+ return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
+ }
+
+ string ReadIdmapd() {
+ return (string) SCR::Read(.etc.idmapd_conf, "Domain");
+ }
+
/**
* Set module data
* @param settings module settings
* @return void
*/
- global define void Set(list<map> settings) ``{
- nfs_entries = maplist(map entry, settings, ``{
+ global define void Set(map settings) ``{
+ if ( haskey(settings, "enable_nfs4") ) {
+ nfs4_enabled = settings["enable_nfs4"]:false;
+ }
+ else
+ nfs4_enabled = ReadNfs4();
+
+ if ( haskey(settings, "idmapd_domain") ) {
+ idmapd_domain = settings["idmapd_domain"]:"localdomain";
+ }
+ else
+ idmapd_domain = ReadIdmapd();
+
+ nfs_entries = maplist(map entry, settings["nfs_entries"]:[], ``{
return($[
"spec":entry["server_path"]:"",
"file":entry["mount_point"]:"",
@@ -104,10 +124,10 @@
* @param settings a map with a single key: nfs_entries
* @return success
*/
- global define boolean Import (list<map> settings) ``{
+ global define boolean Import (map settings) ``{
boolean missing = false;
- settings = maplist(map s,settings,``{
+ settings["nfs_entries"] = maplist(map s,settings["nfs_entries"]:[],``{
foreach (string k, ["server_path", "mount_point", "nfs_options"], ``{
if (! haskey (s, k))
{
@@ -140,7 +160,12 @@
* Dump the NFS settings to a map, for autoinstallation use.
* @return a list of nfs entries.
*/
- global define list Export () ``{
+ global define map Export () ``{
+ map settings = $[];
+
+ settings["enable_nfs4"] = nfs4_enabled;
+ settings["idmapd_domain"] = idmapd_domain;
+
list entries = maplist(map entry, nfs_entries, ``{
return($[
"server_path":entry["spec"]:"",
@@ -149,7 +174,8 @@
"nfs_options":entry["mntops"]:""
]);
});
- return entries;
+ settings["nfs_entries"]= entries;
+ return settings;
}
/* ------------------------------------------------------------ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/ui.ycp new/yast2-nfs-client-2.19.1/src/ui.ycp
--- old/yast2-nfs-client-2.19.0/src/ui.ycp 2010-01-18 17:25:45.000000000 +0100
+++ new/yast2-nfs-client-2.19.1/src/ui.ycp 2010-02-04 13:16:14.000000000 +0100
@@ -13,7 +13,7 @@
* Dan Vesely
* Martin Vidner
*
- * $Id: ui.ycp 56676 2009-04-08 08:41:20Z kmachalkova $
+ * $Id: ui.ycp 60690 2010-02-04 12:16:13Z kmachalkova $
*
* Network NFS client dialogs
*
@@ -73,7 +73,7 @@
`SelectionBox (`id (`items), title, items),
`VSpacing(10)
),
- `HBox (
+ `ButtonBox (
`PushButton (`id (`ok), `opt (`default, `key_F10),
Label::OKButton ()),
`PushButton (`id (`cancel), `opt (`key_F9),
@@ -258,7 +258,7 @@
`VSpacing(0.2),
`TextEntry(`id(`optionsent), _("O&ptions"), options),
`VSpacing(0.2),
- `HBox(
+ `ButtonBox(
`PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()),
`PushButton(`id(`cancel), `opt (`key_F9), Label::CancelButton()),
`PushButton(`id(`help), `opt (`key_F1), Label::HelpButton())),
@@ -679,12 +679,12 @@
nfs_entries = Nfs::nfs_entries;
// dialog heading
- Wizard::SetContentsButtons(_("NFS Client Configuration"),
+ Wizard::SetContents(_("NFS Client Configuration"),
MainDialogLayout(), help_text1,
- Label::BackButton (),
- Label::OKButton ());
- Wizard::HideBackButton();
- Wizard::SetAbortButton(`abort, Label::CancelButton());
+ false,
+ true);
+ //Wizard::HideBackButton();
+ //Wizard::SetAbortButton(`abort, Label::CancelButton());
InitFstabEntries();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/wizards.ycp new/yast2-nfs-client-2.19.1/src/wizards.ycp
--- old/yast2-nfs-client-2.19.0/src/wizards.ycp 2009-07-21 16:37:57.000000000 +0200
+++ new/yast2-nfs-client-2.19.1/src/wizards.ycp 2010-02-04 13:16:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Martin Vidner
*
- * $Id: wizards.ycp 24875 2005-08-12 11:59:21Z mvidner $
+ * $Id: wizards.ycp 60690 2010-02-04 12:16:13Z kmachalkova $
*/
{
@@ -54,7 +54,7 @@
]
];
- Wizard::CreateDialog ();
+ Wizard::OpenOKDialog ();
Wizard::SetDesktopIcon ("nfs");
any ret = Sequencer::Run (aliases, sequence);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/VERSION new/yast2-nfs-client-2.19.1/VERSION
--- old/yast2-nfs-client-2.19.0/VERSION 2010-01-18 18:07:36.000000000 +0100
+++ new/yast2-nfs-client-2.19.1/VERSION 2010-02-04 14:58:06.000000000 +0100
@@ -1 +1 @@
-2.19.0
+2.19.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org