Author: mvidner Date: Tue Feb 3 16:26:28 2009 New Revision: 55211 URL: http://svn.opensuse.org/viewcvs/yast?rev=55211&view=rev Log: Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). Modified: trunk/nfs-server/VERSION trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/routines.ycp trunk/nfs-server/src/ui.ycp Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=55211&r1=55210&r2=55211&view=diff ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Tue Feb 3 16:26:28 2009 @@ -1 +1 @@ -2.17.5 +2.17.6 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=55211&r1=55210&r2=55211&view=diff ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Tue Feb 3 16:26:28 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: trunk/nfs-server/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/routines.ycp?rev=55211&r1=55210&r2=55211&view=diff ============================================================================== --- trunk/nfs-server/src/routines.ycp (original) +++ trunk/nfs-server/src/routines.ycp Tue Feb 3 16:26:28 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: trunk/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=55211&r1=55210&r2=55211&view=diff ============================================================================== --- trunk/nfs-server/src/ui.ycp (original) +++ trunk/nfs-server/src/ui.ycp Tue Feb 3 16:26:28 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>/data</tt> and <tt>/data2</tt> as +<tt>/</tt> and <tt>/more</tt>, respectively, use<br /> +<pre>/data 10.0.0.1(fsid=0,crossmnt,ro,...) +/data/more 10.0.0.1(bind=/data2,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