Merge pull request #4 from mvidner/Code-11-SP2

Port accumulated fixes from master

MAINTAINER

@@ -1 +1 @@
-Katarina Machalkova <kmachalkova@suse.cz>
+Martin Vidner <mvidner@suse.cz>

VERSION

@@ -1 +1 @@
-2.17.13
+2.17.14

package/yast2-nfs-client.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Oct 15 08:28:10 UTC 2012 - mfilka@suse.com
+
+- ported several old fixes from master branch: 
+  - updated testsuite
+  - added support for IPv6 in square brackets - bnc#719538
+  - IPv6 addresses supported - bnc#719538
+  - removed some dead code, whitespaces
+  - autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 
+  - Base server hostname combobox on existing values - bnc#547983
+  - Fixed handling of return symbols (buggy patch for bnc#589541, now
+    bnc#608166)
+  - added fix for problem with OK button (bnc#589541)
+- 2.17.14 
+
 -------------------------------------------------------------------
 Mon Jun 27 10:50:58 UTC 2011 - jreidinger@novell.com
 

src/Nfs.ycp

@@ -117,22 +117,23 @@
 		}
 	    });
 
-	    //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts
-	    //thus we need to keep info on nfs version (v3 vs. v4)
-	    //But older AY profiles might not contain this element
-	    //so let's assume nfsv3 in that case (#395850)
-	    if ( !haskey(s, "vfstype") )
-	    {
-	        s["vfstype"] = "nfs";
-	    } else {
- 		if (s["vfstype"]:"nfs" == "nfs4")
-		{
-		    nfs4_enabled = true;
- 		}
-	    }
+            //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts
+            //thus we need to keep info on nfs version (v3 vs. v4)
+            //But older AY profiles might not contain this element
+            //so let's assume nfsv3 in that case (#395850)
+            if ( !haskey(s, "vfstype") )
+            {
+                s["vfstype"] = "nfs";
+            } else {
+                if (s["vfstype"]:"nfs" == "nfs4")
+                {
+                    nfs4_enabled = true;
+                }
+            }
 	    return s;
 
 	});
+
 	if (missing)
 	{
 	    return false;
@@ -279,10 +280,10 @@
 	Progress::set(progress_orig);
 
 	portmapper = FindPortmapper();
-	//There is neither rpcbind  nor portmap  
+	//There is neither rpcbind  nor portmap
 	if ( portmapper == "" )
 	{
-	    //so let's install rpcbind (default since #423026) 
+	    //so let's install rpcbind (default since #423026)
 	    required_packages = add( required_packages, "rpcbind" );
 	    portmapper = "rpcbind";
 	}
@@ -348,11 +349,7 @@ the NFS client configuration.\n"));
 	    return false;
 	}
 
-/*	if (size (nfs_entries) == 0)
-	{
-	    // Service::Adjust ("nfs", "disable"); // what if autofs needs it?
-	}*/
-
+	portmapper = FindPortmapper();
 	if (size (nfs_entries) != 0)
 	{
 	    Service::Enable( portmapper );
@@ -608,8 +605,8 @@ the NFS client configuration.\n"));
 	return true;
     }
 
-	/**
-	* Return required packages for auto-installation
+    /**
+    * Return required packages for auto-installation
     * @return map of packages to be installed and to be removed
     */
     global define map AutoPackages() ``{