Author: mvidner
Date: Fri Feb 29 13:25:52 2008
New Revision: 45120
URL: http://svn.opensuse.org/viewcvs/yast?rev=45120&view=rev
Log:
Merged revisions 39324-45119 via svnmerge from
http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/nfs-server
........
r39403 | mvidner | 2007-07-13 16:14:37 +0200 (Pá, 13 čec 2007) | 4 lines
Do not call SCR at variable initialization.
(Readded the appropriate half of r36930)
(Preparing to fix #260723)
........
r39425 | mvidner | 2007-07-16 13:06:56 +0200 (Po, 16 čec 2007) | 3 lines
Do not touch NFS4 during autoinstallation; really fixing "Unable to
write idmapd.conf" (#260723).
........
Modified:
branches/SuSE-SLE-10-SP2-Branch/nfs-server/ (props changed)
branches/SuSE-SLE-10-SP2-Branch/nfs-server/VERSION
branches/SuSE-SLE-10-SP2-Branch/nfs-server/package/yast2-nfs-server.changes
branches/SuSE-SLE-10-SP2-Branch/nfs-server/src/NfsServer.ycp
branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite-unfsd.out
branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite.out
branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite2.out
branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/routines1.out
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/VERSION?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/VERSION (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/VERSION Fri Feb 29 13:25:52 2008
@@ -1 +1 @@
-2.13.8
+2.13.9
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/package/yast2-nfs-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/package/yast2-nfs-server.changes?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/package/yast2-nfs-server.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/package/yast2-nfs-server.changes Fri Feb 29 13:25:52 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Jul 16 13:04:55 CEST 2007 - mvidner@suse.cz
+
+- Do not touch NFS4 during autoinstallation; really fixing "Unable to
+ write idmapd.conf" (#287338).
+- 2.13.9
+
+-------------------------------------------------------------------
Wed Apr 4 18:00:43 CEST 2007 - mvidner@suse.cz
- Do not pop up an error about idmapd during autoinstallation
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/src/NfsServer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/src/NfsServer.ycp?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/src/NfsServer.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/src/NfsServer.ycp Fri Feb 29 13:25:52 2008
@@ -67,13 +67,13 @@
/**
* Enable nfsv4
*/
- global boolean enable_nfsv4 = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
+ global boolean enable_nfsv4 = true;
/**
* GSS Security ?
*/
- global boolean nfs_security = (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes");
+ global boolean nfs_security = false;
/**
@@ -137,7 +137,11 @@
``{
start = settings["start_nfsserver"]:false;
exports = settings["nfs_exports"]:[];
- return;
+ // #260723, #287338: fix wrongly initialized variables
+ // but do not extend the schema yet
+ enable_nfsv4 = false;
+ domain = "";
+ nfs_security = false;
}
@@ -154,13 +158,21 @@
}
/**
- * Reads NFS settings from the SCR (.etc.exports)
+ * Reads NFS settings from the SCR (.etc.exports),
+ * from SCR (.sysnconfig.nfs) and SCR (.etc.idmapd_conf),if necessary.
* @return true on success
*/
global define boolean Read () ``{
start = Service::Enabled("nfsserver");
exports = (list >) SCR::Read (.etc.exports);
have_nfslock = (boolean) SCR::Read (.init.scripts.exists, "nfslock");
+ enable_nfsv4 = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
+ nfs_security = (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes");
+
+ if (enable_nfsv4)
+ {
+ domain = (string) SCR::Read(.etc.idmapd_conf,"Domain");
+ }
boolean progress_orig = Progress::set (false);
SuSEFirewall::Read ();
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite-unfsd.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite-unfsd.out?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite-unfsd.out (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite-unfsd.out Fri Feb 29 13:25:52 2008
@@ -1,10 +1,10 @@
-Read .sysconfig.nfs.NFS4_SUPPORT nil
-Read .sysconfig.nfs.NFS_SECURITY_GSS nil
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 .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.exists "SuSEfirewall2_init" true
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite.out?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite.out (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite.out Fri Feb 29 13:25:52 2008
@@ -1,10 +1,10 @@
-Read .sysconfig.nfs.NFS4_SUPPORT nil
-Read .sysconfig.nfs.NFS_SECURITY_GSS nil
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 .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.exists "SuSEfirewall2_init" true
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite2.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite2.out?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite2.out (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/readwrite2.out Fri Feb 29 13:25:52 2008
@@ -1,5 +1,3 @@
-Read .sysconfig.nfs.NFS4_SUPPORT nil
-Read .sysconfig.nfs.NFS_SECURITY_GSS nil
Dump
Dump Read - services are running
Dump
@@ -7,6 +5,8 @@
Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["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.exists "SuSEfirewall2_init" true
@@ -50,6 +50,8 @@
Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["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
Return true
Dump
Dump Write - services are running
@@ -106,6 +108,8 @@
Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["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
+Read .sysconfig.nfs.NFS_SECURITY_GSS nil
Return true
Dump
Dump Write - services will be stopped
@@ -144,6 +148,8 @@
Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["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
+Read .sysconfig.nfs.NFS_SECURITY_GSS nil
Return true
Dump
Dump Write - services will be started
Modified: branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/routines1.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/routines1.out?rev=45120&r1=45119&r2=45120&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/routines1.out (original)
+++ branches/SuSE-SLE-10-SP2-Branch/nfs-server/testsuite/tests/routines1.out Fri Feb 29 13:25:52 2008
@@ -10,8 +10,8 @@
Return nil
Return [`item (`id ("/projects"), "/projects "), `item (`id ("/usr"), "/usr "), `item (`id ("/pub"), "/pub ")]
Return []
-Return `SelectionBox (`id (`exportsbox), `opt (`notify), "Dire&ctories", [`item (`id ("/projects"), "/projects "), `item (`id ("/usr"), "/usr "), `item (`id ("/pub"), "/pub ")])
-Return `SelectionBox (`id (`exportsbox), `opt (`notify), "Dire&ctories", [])
+Return `Table (`id (`exptable), `opt (`notify, `immediate), `header ("Directories", "Bindmount Targets"), [`item (`id ("/projects"), "/projects ", ""), `item (`id ("/usr"), "/usr ", ""), `item (`id ("/pub"), "/pub ", "")])
+Return `Table (`id (`exptable), `opt (`notify, `immediate), `header ("Directories", "Bindmount Targets"), [])
Return [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.localdomain(ro)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
Return [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
Return []
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
