Author: mvidner Date: Wed Jan 2 13:53:37 2008 New Revision: 43251 URL: http://svn.opensuse.org/viewcvs/yast?rev=43251&view=rev Log: Merged revisions 37001-43249 via svnmerge from http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/nfs-server ........ r37002 | mvidner | 2007-03-16 11:37:16 +0100 (Pá, 16 bře 2007) | 5 lines reverted changes that are too late for the service pack now. :-( they are in the trunk instead. svn merge -r37000:36510 . ........ r37311 | mvidner | 2007-04-04 18:00:57 +0200 (St, 04 dub 2007) | 3 lines Do not pop up an error about idmapd during autoinstallation (#260723). ........ r37312 | mvidner | 2007-04-04 18:14:22 +0200 (St, 04 dub 2007) | 2 lines adjusted test cases ........ r37313 | mvidner | 2007-04-04 18:22:57 +0200 (St, 04 dub 2007) | 2 lines adjusted test cases... really ........ 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: trunk/nfs-server/ (props changed) 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.out trunk/nfs-server/testsuite/tests/readwrite2.out Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=43251&r1=4... ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Wed Jan 2 13:53:37 2008 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-serv... ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Wed Jan 2 13:53:37 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 2 13:34:33 CET 2008 - mvidner@suse.cz + +- Do not touch NFS4 during autoinstallation; really fixing "Unable to + write idmapd.conf" (#287338). +- Do not pop up an error about idmapd during autoinstallation + (#260723). + +------------------------------------------------------------------- Mon Aug 20 14:17:18 CEST 2007 - mvidner@suse.cz - Require nfs-kernel-server.rpm because nfs-utils.rpm got split (#286300). Modified: trunk/nfs-server/src/NfsServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev=... ============================================================================== --- trunk/nfs-server/src/NfsServer.ycp (original) +++ trunk/nfs-server/src/NfsServer.ycp Wed Jan 2 13:53:37 2008 @@ -25,7 +25,6 @@ import "Summary"; import "SuSEFirewall"; import "Wizard"; - import "Popup"; /* default value of settings modified */ @@ -139,7 +138,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; } @@ -254,6 +257,10 @@ if(enable_nfsv4) { SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"yes"); + if( !( SCR::Write(.etc.idmapd_conf,["Domain",(string)domain]) ) ) + { + Report::Error(_("Unable to write to idmapd.conf.")); + } } else { @@ -268,14 +275,8 @@ { SCR::Write(.sysconfig.nfs.NFS_SECURITY_GSS,"no"); } - SCR::Write(.sysconfig.nfs,nil); - if( !( SCR::Write(.etc.idmapd_conf,["Domain",(string)domain]) ) ) - { - Popup::Message(_("Unable to write to idmapd.conf.")); - } - Progress::NextStage (); if (!start) Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwr... ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite-unfsd.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.out Wed Jan 2 13:53:37 2008 @@ -21,7 +21,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Modified: trunk/nfs-server/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwr... ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite.out Wed Jan 2 13:53:37 2008 @@ -21,7 +21,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Modified: trunk/nfs-server/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readwr... ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite2.out Wed Jan 2 13:53:37 2008 @@ -25,7 +25,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true @@ -67,7 +66,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true @@ -126,7 +124,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true @@ -167,7 +164,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org