Author: kmachalkova
Date: Mon Apr 14 19:03:50 2008
New Revision: 46616
URL: http://svn.opensuse.org/viewcvs/yast?rev=46616&view=rev
Log:
nfsv4 support (fate #302031)
Modified:
trunk/nfs-client/src/Nfs.ycp
trunk/nfs-client/src/ui.ycp
trunk/nfs-client/testsuite/tests/r-fstab.out
trunk/nfs-client/testsuite/tests/r-fstab.ycp
trunk/nfs-client/testsuite/tests/readwrite.ycp
Modified: trunk/nfs-client/src/Nfs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=46616&r1=46615&r2=46616&view=diff
==============================================================================
--- trunk/nfs-client/src/Nfs.ycp (original)
+++ trunk/nfs-client/src/Nfs.ycp Mon Apr 14 19:03:50 2008
@@ -26,6 +26,7 @@
import "Summary";
import "SuSEFirewall";
import "Progress";
+ import "PackageSystem";
import "Wizard";
include "nfs/routines.ycp";
@@ -54,7 +55,7 @@
/**
* Required packages
*/
- global list required_packages = ["portmap"];
+ global list <string> required_packages = ["portmap", "nfs-client"];
/**
* eg.: [ $["spec": "moon:/cheese", file: "/mooncheese", "mntopts": "defaults"], ...]
@@ -66,6 +67,8 @@
*/
global list<map> non_nfs_entries = [];
+ global boolean nfs4_enabled = false;
+
// list of created directories
list<string> created_dirs = [];
@@ -228,8 +231,16 @@
return (entry["vfstype"]:"" != "nfs");
});
+ nfs4_enabled = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
+
SuSEFirewall::Read ();
+ if (nfs4_enabled)
+ required_packages = add( required_packages, "nfsidmap");
+
+ if ( !PackageSystem::CheckAndInstallPackagesInteractive( required_packages ) )
+ return false;
+
return true;
}
@@ -246,7 +257,7 @@
list