Rebuilt nfs section structure

enable_nfs4 and idmapd_domain are new global
(optional) elements. Hope it works

svn path=/trunk/nfs-client/; revision=60683

src/Nfs.ycp

@@ -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 <string, any> 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 <string, any> 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 <string, any> 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;
     }
 
     /* ------------------------------------------------------------ */

src/nfs.rnc

@@ -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 }
+      }*
+    }
   }

src/nfs_auto.ycp

@@ -37,13 +37,13 @@ include "nfs/ui.ycp";
 
 any ret = nil;
 string func = "";
-list<map> param = [];
+map <string, any> 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), list))
-	param = (list<map>) WFM::Args(1);
+    if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+	param = ( map <string, any> ) WFM::Args(1);
 }
 y2debug("func=%1", func);
 y2debug("param=%1", param);
@@ -80,7 +80,7 @@ else if (func == "Packages") {
 }
 /* Return actual state */
 else if (func == "Export") {
-    ret = (list) Nfs::Export();
+    ret = (map) Nfs::Export();
 }
 else if (func == "Read") {
     ret = (boolean)  Nfs::Read();