Author: mvidner Date: Wed Feb 4 13:12:04 2009 New Revision: 55234 URL: http://svn.opensuse.org/viewcvs/yast?rev=55234&view=rev Log: Merged revisions 55211,55224 via svnmerge from http://svn.opensuse.org/svn/yast/trunk/nfs-server ........ r55211 | mvidner | 2009-02-03 16:26:28 +0100 (Út, 03 úno 2009) | 2 lines Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). ........ r55224 | mvidner | 2009-02-04 10:58:24 +0100 (St, 04 úno 2009) | 2 lines Sex sells, this is a better example. ........ Modified: branches/SuSE-Code-11-Branch/nfs-server/ (props changed) branches/SuSE-Code-11-Branch/nfs-server/VERSION branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-server/VERSION?rev=55234&r1=55233&r2=55234&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/nfs-server/VERSION Wed Feb 4 13:12:04 2009 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes?rev=55234&r1=55233&r2=55234&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes (original) +++ branches/SuSE-Code-11-Branch/nfs-server/package/yast2-nfs-server.changes Wed Feb 4 13:12:04 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 16:26:12 CET 2009 - mvidner@suse.cz + +- Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). +- 2.17.6 + +------------------------------------------------------------------- Wed Dec 3 16:07:28 CET 2008 - kmachalkova@suse.cz - Missing strings marked for translation (bnc#449700) Modified: branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp?rev=55234&r1=55233&r2=55234&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp (original) +++ branches/SuSE-Code-11-Branch/nfs-server/src/routines.ycp Wed Feb 4 13:12:04 2009 @@ -200,7 +200,7 @@ if (withfsid) return default_options; else - return "fsid=0," + default_options; + return "fsid=0,crossmnt" + default_options; // bnc#471874 c1 } Modified: branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp?rev=55234&r1=55233&r2=55234&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/nfs-server/src/ui.ycp Wed Feb 4 13:12:04 2009 @@ -511,7 +511,16 @@ // Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled. help_text = help_text + _("<p>The NFSv4 option is enabled in the previous page. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client.</p>"); - help_text = help_text + _("<p>In case of multiple exports to a NFSv4 client, you need to bind the exported paths with no fsid=0 to the one with fsid=0. To do this, add another export option (bind=/target/path), where /target/path amounts to some directory existing below the fsid=0 exported tree.</p>"); + // bnc#471874, NFS4 is complex and so is our UI :-/ + // but let's fix the help at least + // Watch out, the space is necessary between br and slash. + help_text = help_text + _("<p>In case of multiple exports to a NFSv4 client, +you need to bind the exported paths with no fsid=0 to the one with fsid=0. +To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as +<tt>/</tt> and <tt>/husband</tt>, respectively, use<br /> +<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...) +/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre> +</p>"); } // Help, part 5 of 5 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org