Author: mvidner Date: Mon Aug 20 14:17:30 2007 New Revision: 40352 URL: http://svn.opensuse.org/viewcvs/yast?rev=40352&view=rev Log: Require nfs-kernel-server.rpm because nfs-utils.rpm got split (#286300). Modified: trunk/nfs-server/VERSION trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/NfsServer.ycp trunk/nfs-server/src/nfs_server.ycp trunk/nfs-server/src/ui.ycp Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=40352&r1=40351&r2=40352&view=diff ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Mon Aug 20 14:17:30 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 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=40352&r1=40351&r2=40352&view=diff ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Mon Aug 20 14:17:30 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 20 14:17:18 CEST 2007 - mvidner@suse.cz + +- Require nfs-kernel-server.rpm because nfs-utils.rpm got split (#286300). +- 2.15.4 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/nfs-server/src/NfsServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev=40352&r1=40351&r2=40352&view=diff ============================================================================== --- trunk/nfs-server/src/NfsServer.ycp (original) +++ trunk/nfs-server/src/NfsServer.ycp Mon Aug 20 14:17:30 2007 @@ -55,7 +55,7 @@ * Required packages for this module to operate * */ - global list<string> required_packages = ["nfs-utils"]; + global list<string> required_packages = ["nfs-kernel-server"]; /** @@ -106,6 +106,7 @@ /** * Do we have nfslock? (nfs-utils: yes, nfs-server: no) + * FIXME: check nfs-kernel-server */ boolean have_nfslock = true; @@ -356,6 +357,7 @@ { if (! Service::Start("svcgssd")) { + // FIXME svcgssd is gone! (only nfsserver is left) Report::Error(_("Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is fine.")); ok = false; } Modified: trunk/nfs-server/src/nfs_server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/nfs_server.ycp?rev=40352&r1=40351&r2=40352&view=diff ============================================================================== --- trunk/nfs-server/src/nfs_server.ycp (original) +++ trunk/nfs-server/src/nfs_server.ycp Mon Aug 20 14:17:30 2007 @@ -62,7 +62,7 @@ ], ]; - // If nfs-utils nor nfs-server is not installed, install nfs-utils. + // If nfs-kernel-server nor nfs-server is not installed, install nfs-kernel-server. // TODO: require installation of alternate packages if (!Package::Installed ("nfs-server")) { Modified: trunk/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=40352&r1=40351&r2=40352&view=diff ============================================================================== --- trunk/nfs-server/src/ui.ycp (original) +++ trunk/nfs-server/src/ui.ycp Mon Aug 20 14:17:30 2007 @@ -103,7 +103,7 @@ // message popup; %1, %2 are package names _("The user mode NFS server (%1) cannot export directories with spaces in their names. -Use the kernel-based server (%2) to do that."), "nfs-server", "nfs-utils")); +Use the kernel-based server (%2) to do that."), "nfs-server", "nfs-kernel-server")); ret = nil; } else if (SCR::Read (.target.size, mountpoint) < 0 && !Mode::config ()) { @@ -335,6 +335,7 @@ it as localdomain or refer to man page for idmapd and idmapd.conf if you are not sure.</P>"); help_text = help_text + + // FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm _("<P>If the server and client must authenticate using GSS library, please enable the <B>Enable GSS Security</B> checkbox. For being able to use GSS API, currently you need to have kerberos and gssapi (nfs-utils > 1.0.7) on your system</P>"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org