fix enablement of NFSv4 in autoyast (bnc#684859)

svn path=/branches/SuSE-Code-11-SP2-Branch/nfs-client/; revision=64596
yast · Jun 27, 2011 · 25895b2 · 25895b2
1 parent c86fe66
commit 25895b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Nfs.ycp b/src/Nfs.ycp
@@ -72,7 +72,7 @@
      */
     global list<map> non_nfs_entries = [];
 
-    global boolean nfs4_enabled = false;
+    global boolean nfs4_enabled = nil;
 
     global string idmapd_domain = "";
 
@@ -124,6 +124,11 @@
 	    if ( !haskey(s, "vfstype") )
 	    {
 	        s["vfstype"] = "nfs";
+	    } else {
+ 		if (s["vfstype"]:"nfs" == "nfs4")
+		{
+		    nfs4_enabled = true;
+ 		}
 	    }
 	    return s;
 
@@ -357,16 +362,15 @@ the NFS client configuration.\n"));
 	    Service::Enable("nfsboot");
 	}
 
-        if(nfs4_enabled)
+        if(nfs4_enabled == true)
         {
                 SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"yes");
 		SCR::Write(.etc.idmapd_conf, ["Domain",  idmapd_domain] );
         }
-        else
+        else if (nfs4_enabled == false)
         {
                 SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"no");
         }
-
 	boolean progress_orig = Progress::set (false);
 	SuSEFirewall::WriteOnly ();
 	Progress::set (progress_orig);
@@ -518,7 +522,7 @@ the NFS client configuration.\n"));
 	{
 	    if (Service::Start( portmapper ) == false)
 	    {
-		y2warning( sformat("%1 cannot be started", portmapper) );
+		y2warning("%1 cannot be started", portmapper);
 		return nil;
 	    }
 	}

diff --git a/src/ui.ycp b/src/ui.ycp
@@ -570,8 +570,8 @@ rights.</p>") + fw_cwm_widget["help"]:"";
     void InitSettings( )
     {
         CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
-        UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
-	UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled);
+        UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled != false);
+	UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false);
 	UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain);
     }