[yast-commit] r51773 - in /trunk/nfs-server: ./ package/ src/ testsuite/tests/

2 Oct 2008

Author: mvidner
Date: Thu Oct  2 11:10:04 2008
New Revision: 51773

URL: http://svn.opensuse.org/viewcvs/yast?rev=51773&view=rev
Log:
Use rpcbind by default and fall back to portmap (bnc#423026).

Modified:
    trunk/nfs-server/VERSION
    trunk/nfs-server/package/yast2-nfs-server.changes
    trunk/nfs-server/src/NfsServer.ycp
    trunk/nfs-server/testsuite/tests/readwrite-unfsd.out
    trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp
    trunk/nfs-server/testsuite/tests/readwrite.out
    trunk/nfs-server/testsuite/tests/readwrite.ycp
    trunk/nfs-server/testsuite/tests/readwrite2.out
    trunk/nfs-server/testsuite/tests/readwrite2.ycp
    trunk/nfs-server/yast2-nfs-server.spec.in

Modified: trunk/nfs-server/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================

--- trunk/nfs-server/VERSION (original)
+++ trunk/nfs-server/VERSION Thu Oct  2 11:10:04 2008
@@ -1 +1 @@
-2.17.0
+2.17.1

Modified: trunk/nfs-server/package/yast2-nfs-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-server.changes?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/package/yast2-nfs-server.changes (original)
+++ trunk/nfs-server/package/yast2-nfs-server.changes Thu Oct  2 11:10:04 2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Oct  2 11:09:47 CEST 2008 - mvidner@suse.cz
+
+- Use rpcbind by default and fall back to portmap (bnc#423026).
+- 2.17.1
+
+-------------------------------------------------------------------
 Mon Sep  8 13:48:46 CEST 2008 - mvidner@suse.cz
 
 - Applied proofreading changes from Andrew Spackman.

Modified: trunk/nfs-server/src/NfsServer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/src/NfsServer.ycp (original)
+++ trunk/nfs-server/src/NfsServer.ycp Thu Oct  2 11:10:04 2008
@@ -214,6 +214,24 @@
 	    return true;
     }
 
+
+    string portmapper = nil;
+
+    /**
+     * Get the used port mapper: since SLE11A3 we have rpcbind
+     * instead of portmap as the default (bnc#423026)
+     */
+    string Portmapper() {
+	if (portmapper == nil) {
+	    portmapper = Service::Find(["rpcbind", "portmap"]);
+	    if (portmapper == "") {
+		y2error("No portmapper found");
+		portmapper = "rpcbind";
+	    }
+	}
+	return portmapper;
+    }
+
     /**
      * Saves NFS server configuration. (exports(5))
      * Creates any missing directories.
@@ -302,7 +320,7 @@
 	}
 	else
 	{
-	    if (! Service::Enable("portmap"))
+	    if (! Service::Enable(Portmapper ()))
 	    {
 		Report::Error (Service::Error());
 		ok = false;
@@ -387,10 +405,10 @@
 
 	    if (!write_only)
 	    {
-		if (Service::Status("portmap") != 0 )
+		if (Service::Status(Portmapper ()) != 0 )
 		{
 		    // portmap must not be started if it is running already (see bug # 9999)
-		    Service::Start("portmap");
+		    Service::Start(Portmapper ());
 		}
 
 		Service::Stop("nfsserver");

Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwrite-unfsd.out?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/testsuite/tests/readwrite-unfsd.out (original)
+++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.out Thu Oct  2 11:10:04 2008
@@ -1,12 +1,12 @@
 Dump	Read
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
 Read	.init.scripts.exists "nfslock" false
 Read	.sysconfig.nfs.NFS4_SUPPORT nil
 Read	.sysconfig.nfs.NFS_SECURITY_GSS nil
 Read	.init.scripts.exists "SuSEfirewall2_init" true
-Read	.init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.init.scripts.exists "SuSEfirewall2_init" true
 Execute	.target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
 Return	true
@@ -21,24 +21,25 @@
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
 Write	.sysconfig.nfs nil true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.runlevel "portmap" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.runlevel "rpcbind" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "idmapd" true
 Execute	.target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0
-Read	.init.scripts.exists "portmap" true
-Execute	.target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0
+Read	.init.scripts.exists "rpcbind" true
+Execute	.target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfsserver" true
 Execute	.target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfsserver" true

Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp (original)
+++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp Thu Oct  2 11:10:04 2008
@@ -53,14 +53,14 @@
 	    "scripts": $[
 		"exists": true,
 		"runlevel": $[
-		    "portmap": service_on,
+		    "rpcbind": service_on,
 		    "nfsserver": service_on,
 		    "network": service_on,
 		    "networkmanager": service_off,
 		    ],
 		// their contents is not important for ServiceAdjust
 		"comment": $[
-		    "portmap": $[],
+		    "rpcbind": $[],
 		    "nfsserver": $[],
 		    ],
 		],

Modified: trunk/nfs-server/testsuite/tests/readwrite.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwrite.out?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/testsuite/tests/readwrite.out (original)
+++ trunk/nfs-server/testsuite/tests/readwrite.out Thu Oct  2 11:10:04 2008
@@ -1,12 +1,12 @@
 Dump	Read
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
 Read	.init.scripts.exists "nfslock" true
 Read	.sysconfig.nfs.NFS4_SUPPORT nil
 Read	.sysconfig.nfs.NFS_SECURITY_GSS nil
 Read	.init.scripts.exists "SuSEfirewall2_init" true
-Read	.init.scripts.runlevel "SuSEfirewall2_init" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "SuSEfirewall2_init" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.init.scripts.exists "SuSEfirewall2_init" true
 Execute	.target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
 Return	true
@@ -21,29 +21,30 @@
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
 Write	.sysconfig.nfs nil true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.runlevel "portmap" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "portmap" $["nfslock":$[], "nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.runlevel "rpcbind" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "rpcbind" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
-Read	.init.scripts.runlevel "nfslock" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfslock" $["nfslock":$[], "nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfslock" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfslock" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfsserver" $["nfslock":$[], "nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfsserver" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "idmapd" true
 Execute	.target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0
-Read	.init.scripts.exists "portmap" true
-Execute	.target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0
+Read	.init.scripts.exists "rpcbind" true
+Execute	.target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfsserver" true
 Execute	.target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfslock" true

Modified: trunk/nfs-server/testsuite/tests/readwrite.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwrite.ycp?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/testsuite/tests/readwrite.ycp (original)
+++ trunk/nfs-server/testsuite/tests/readwrite.ycp Thu Oct  2 11:10:04 2008
@@ -53,13 +53,13 @@
 	    "scripts": $[
 		"exists": true,
 		"runlevel": $[
-		    "portmap": service_on,
+		    "rpcbind": service_on,
 		    "nfsserver": service_on,
 		    "nfslock": service_on,
 		    ],
 		// their contents is not important for ServiceAdjust
 		"comment": $[
-		    "portmap": $[],
+		    "rpcbind": $[],
 		    "nfsserver": $[],
 		    "nfslock": $[],
 		    ],

Modified: trunk/nfs-server/testsuite/tests/readwrite2.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwrite2.out?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/testsuite/tests/readwrite2.out (original)
+++ trunk/nfs-server/testsuite/tests/readwrite2.out Thu Oct  2 11:10:04 2008
@@ -2,13 +2,13 @@
 Dump	Read  - services are running
 Dump	
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
 Read	.init.scripts.exists "nfslock" true
 Read	.sysconfig.nfs.NFS4_SUPPORT nil
 Read	.sysconfig.nfs.NFS_SECURITY_GSS nil
 Read	.init.scripts.exists "SuSEfirewall2_init" true
-Read	.init.scripts.runlevel "SuSEfirewall2_init" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "SuSEfirewall2_init" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.init.scripts.exists "SuSEfirewall2_init" true
 Execute	.target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
 Return	true
@@ -30,16 +30,16 @@
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]]
 Execute	.target.bash_output "/sbin/insserv -r /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.exists "nfslock" true
 Execute	.target.bash "/etc/init.d/nfslock stop" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
-Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "SuSEfirewall2_init" true
 Execute	.target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
 Return	true
@@ -47,7 +47,7 @@
 Dump	Read  - services are running
 Dump	
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
 Read	.etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
 Read	.init.scripts.exists "nfslock" true
 Read	.sysconfig.nfs.NFS4_SUPPORT nil
@@ -66,30 +66,31 @@
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
 Write	.sysconfig.nfs nil true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.runlevel "portmap" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.runlevel "rpcbind" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
-Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]]
 Execute	.target.bash_output "/sbin/insserv -d /etc/init.d/nfslock" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]]
+Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "idmapd" true
 Execute	.target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0
-Read	.init.scripts.exists "portmap" true
-Execute	.target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0
+Read	.init.scripts.exists "rpcbind" true
+Execute	.target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfsserver" true
 Execute	.target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfslock" true
@@ -105,7 +106,7 @@
 Dump	Read  - services are stopped
 Dump	
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
 Read	.etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
 Read	.init.scripts.exists "nfslock" true
 Read	.sysconfig.nfs.NFS4_SUPPORT nil
@@ -129,15 +130,15 @@
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
-Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
+Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "nfslock" true
 Execute	.target.bash "/etc/init.d/nfslock stop" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
-Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
-Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
+Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]]
 Read	.init.scripts.exists "SuSEfirewall2_init" true
 Execute	.target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0
 Return	true
@@ -145,7 +146,7 @@
 Dump	Read  - services are stopped
 Dump	
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
 Read	.etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
 Read	.init.scripts.exists "nfslock" true
 Read	.sysconfig.nfs.NFS4_SUPPORT nil
@@ -164,23 +165,23 @@
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
 Write	.sysconfig.nfs nil true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.exists "portmap" true
-Read	.init.scripts.runlevel "portmap" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
-Read	.init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]]
-Execute	.target.bash_output "/sbin/insserv -d /etc/init.d/portmap" $["exit":0, "stderr":"", "stdout":""]
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.exists "rpcbind" true
+Read	.init.scripts.runlevel "rpcbind" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
+Read	.init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]]
+Execute	.target.bash_output "/sbin/insserv -d /etc/init.d/rpcbind" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
 Read	.init.scripts.exists "nfslock" true
-Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
-Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
+Read	.init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]]
 Execute	.target.bash_output "/sbin/insserv -d /etc/init.d/nfslock" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
 Read	.init.scripts.exists "nfsserver" true
-Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
-Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]]
+Read	.init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]]
+Read	.init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]]
 Execute	.target.bash_output "/sbin/insserv -d /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.exists "idmapd" true
 Execute	.target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0
@@ -188,8 +189,8 @@
 Execute	.target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "svcgssd" true
 Execute	.target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0
-Read	.init.scripts.exists "portmap" true
-Execute	.target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0
+Read	.init.scripts.exists "rpcbind" true
+Execute	.target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfsserver" true
 Execute	.target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0
 Read	.init.scripts.exists "nfslock" true

Modified: trunk/nfs-server/testsuite/tests/readwrite2.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwrite2.ycp?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/testsuite/tests/readwrite2.ycp (original)
+++ trunk/nfs-server/testsuite/tests/readwrite2.ycp Thu Oct  2 11:10:04 2008
@@ -54,12 +54,12 @@
 	    "scripts": $[
 		"exists": true,
 		"runlevel": $[
-		    "portmap": service_on,
+		    "rpcbind": service_on,
 		    "nfsserver": service_on,
 		    ],
 		// their contents is not important for ServiceAdjust
 		"comment": $[
-		    "portmap": $[],
+		    "rpcbind": $[],
 		    "nfsserver": $[],
 		    ],
 		],
@@ -87,9 +87,9 @@
     map READ2 = READ;
     READ2["init","scripts","exists"] = false;
 
-    // services portmap & nfsserver are stopped
+    // services rpcbind & nfsserver are stopped
     map READ3 = READ;
-    READ3["init","scripts","runlevel","portmap"]   = service_off;
+    READ3["init","scripts","runlevel","rpcbind"]   = service_off;
     READ3["init","scripts","runlevel","nfsserver"] = service_off;
 
     map WRITE = $[
@@ -113,7 +113,7 @@
 	    ],
 	];
 
-    // nfsserver and portmap are running
+    // nfsserver and rpcbind are running
     DUMP ("\nRead  - services are running\n");
     TEST (``(NfsServer::Read ()), [READ, WRITE, EXECUTE], nil);
     DUMP ("\nWrite - services will be stopped\n");
@@ -122,7 +122,7 @@
     // And Write
     TEST (``(NfsServer::Write ()), [READ, WRITE, EXECUTE], nil);
 
-    // nfsserver and portmap are running
+    // nfsserver and rpcbind are running
     DUMP ("\nRead  - services are running\n");
     TEST (``(NfsServer::Read ()), [READ, WRITE, EXECUTE], nil);
     DUMP ("\nWrite - services are running\n");
@@ -131,7 +131,7 @@
     // And Write
     TEST (``(NfsServer::Write ()), [READ, WRITE, EXECUTE], nil);
 
-    // nfsserver and portmap are stopped
+    // nfsserver and rpcbind are stopped
     DUMP ("\nRead  - services are stopped\n");
     TEST (``(NfsServer::Read ()), [READ3, WRITE, EXECUTE], nil);
     DUMP ("\nWrite - services will be stopped\n");
@@ -140,7 +140,7 @@
     // And Write
     TEST (``(NfsServer::Write ()), [READ3, WRITE, EXECUTE], nil);
 
-    // nfsserver and portmap are stopped
+    // nfsserver and rpcbind are stopped
     DUMP ("\nRead  - services are stopped\n");
     TEST (``(NfsServer::Read ()), [READ3, WRITE, EXECUTE], nil);
     DUMP ("\nWrite - services will be started\n");

Modified: trunk/nfs-server/yast2-nfs-server.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/yast2-nfs-server.spec.in?rev=51773&r1=51772&r2=51773&view=diff
==============================================================================
--- trunk/nfs-server/yast2-nfs-server.spec.in (original)
+++ trunk/nfs-server/yast2-nfs-server.spec.in Thu Oct  2 11:10:04 2008
@@ -2,7 +2,8 @@
 
 @HEADER@
 BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
-Requires:	yast2 >= 2.11.11
+# Service::Find
+Requires:	yast2 >= 2.17.28
 Requires:	yast2-nfs-common
 
 Provides:	yast2-config-nfs-server yast2-config-nfs-server-devel

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r51773 - in /trunk/nfs-server: ./ package/ src/ testsuite/tests/

mvidner＠svn.opensuse.org