Hello community,
here is the log from the commit of package yast2-nfs-server
checked in at Fri Mar 16 13:46:38 CET 2007.
--------
--- yast2-nfs-server/yast2-nfs-server.changes 2007-03-13 13:19:56.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-nfs-server/yast2-nfs-server.changes 2007-03-16 11:32:17.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Mar 14 12:02:13 IST 2007 - pchakravarthi@novell.com
+
+- Added CLI for setting parameters related to NFSv4 server.
+ (nfs_server.ycp)
+- Modified the testsuite out files to reflect the changes made to
+ NfsServer.ycp
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-server-2.15.2.tar.bz2
New:
----
yast2-nfs-server-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-server.spec ++++++
--- /var/tmp/diff_new_pack.LC2086/_old 2007-03-16 13:46:34.000000000 +0100
+++ /var/tmp/diff_new_pack.LC2086/_new 2007-03-16 13:46:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nfs-server (Version 2.15.2)
+# spec file for package yast2-nfs-server (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-nfs-server
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nfs-server-2.15.2.tar.bz2
+Source0: yast2-nfs-server-2.15.3.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 >= 2.11.11
@@ -43,7 +43,7 @@
Martin Vidner
%prep
-%setup -n yast2-nfs-server-2.15.2
+%setup -n yast2-nfs-server-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +85,12 @@
/usr/share/YaST2/schema/autoyast/rnc/nfs_server.rnc
%changelog
+* Wed Mar 14 2007 - pchakravarthi@novell.com
+- Added CLI for setting parameters related to NFSv4 server.
+ (nfs_server.ycp)
+- Modified the testsuite out files to reflect the changes made to
+ NfsServer.ycp
+- 2.15.3
* Tue Mar 13 2007 - mvidner@suse.cz
- Removed obsolete dependency on yast2-packager (#252979).
- 2.15.2
++++++ yast2-nfs-server-2.15.2.tar.bz2 -> yast2-nfs-server-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.15.2/configure new/yast2-nfs-server-2.15.3/configure
--- old/yast2-nfs-server-2.15.2/configure 2007-03-13 13:22:15.000000000 +0100
+++ new/yast2-nfs-server-2.15.3/configure 2007-03-16 11:37:43.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-nfs-server 2.15.2.
+# Generated by GNU Autoconf 2.60 for yast2-nfs-server 2.15.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-nfs-server'
PACKAGE_TARNAME='yast2-nfs-server'
-PACKAGE_VERSION='2.15.2'
-PACKAGE_STRING='yast2-nfs-server 2.15.2'
+PACKAGE_VERSION='2.15.3'
+PACKAGE_STRING='yast2-nfs-server 2.15.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-nfs-server 2.15.2 to adapt to many kinds of systems.
+\`configure' configures yast2-nfs-server 2.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-nfs-server 2.15.2:";;
+ short | recursive ) echo "Configuration of yast2-nfs-server 2.15.3:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-nfs-server configure 2.15.2
+yast2-nfs-server configure 2.15.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-nfs-server $as_me 2.15.2, which was
+It was created by yast2-nfs-server $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2-nfs-server'
- VERSION='2.15.2'
+ VERSION='2.15.3'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-nfs-server"
MAINTAINER="Martin Vidner "
@@ -3353,7 +3353,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-nfs-server $as_me 2.15.2, which was
+This file was extended by yast2-nfs-server $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3396,7 +3396,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-nfs-server config.status 2.15.2
+yast2-nfs-server config.status 2.15.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.15.2/configure.in new/yast2-nfs-server-2.15.3/configure.in
--- old/yast2-nfs-server-2.15.2/configure.in 2007-03-13 13:22:03.000000000 +0100
+++ new/yast2-nfs-server-2.15.3/configure.in 2007-03-16 11:37:27.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-nfs-server, 2.15.2, http://bugs.opensuse.org/, yast2-nfs-server)
+AC_INIT(yast2-nfs-server, 2.15.3, http://bugs.opensuse.org/, yast2-nfs-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-nfs-server"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.15.2/src/nfs_server.ycp new/yast2-nfs-server-2.15.3/src/nfs_server.ycp
--- old/yast2-nfs-server-2.15.2/src/nfs_server.ycp 2007-02-26 09:49:29.000000000 +0100
+++ new/yast2-nfs-server-2.15.3/src/nfs_server.ycp 2007-03-16 11:33:15.000000000 +0100
@@ -13,7 +13,7 @@
* Dan Vesely
* Martin Vidner
*
- * $Id: nfs_server.ycp 36472 2007-02-26 08:49:27Z mvidner $
+ * $Id: nfs_server.ycp 37001 2007-03-16 10:33:13Z mvidner $
*
* Module for the configuration of the nfs server
*/
@@ -231,6 +231,44 @@
return deleted;
}
+/**
+ * CLI action handler.
+ * @param options command options
+ * @return whether successful
+ */
+define boolean NfsServerSetOptionHandler (map options) {
+
+ string nfs_sec = options["security"]:"";
+ string v4domain = options["domain"]:"";
+ string enablev4 = options["enablev4"]:"";
+
+ if (nfs_sec == "yes")
+ NfsServer::nfs_security = true;
+ if (nfs_sec == "no")
+ NfsServer::nfs_security = false;
+
+ if (enablev4 == "yes")
+ NfsServer::enable_nfsv4 = true;
+ if (enablev4 == "no")
+ NfsServer::enable_nfsv4 = false;
+
+ if (v4domain != "") {
+ if (!NfsServer::enable_nfsv4) {
+ CommandLine::Print(_("Domain can not be set without enabling NFSv4. Please use 'set enablev4' command."));
+ return false;
+ }
+ NfsServer::domain = v4domain;
+ }
+
+ if (nfs_sec == "" && enablev4 == "" && v4domain == "") {
+ CommandLine::Print(_("Command set must be used as in 'set option=value'. Please use 'set help' to know the options."));
+ return false;
+ }
+
+ return true;
+}
+
+
map cmdline_description = $[
"id" : "nfs-server",
/* Command line help text for the nfs-server module */
@@ -246,49 +284,59 @@
],
"start" : $[
"handler" : NfsServerStartHandler,
- // command line action help
"help" : _("Start NFS server"),
],
"stop" : $[
"handler" : NfsServerStopHandler,
- // command line action help
"help" : _("Stop NFS server"),
],
"add" : $[
"handler" : NfsServerAddHandler,
- // command line action help
"help" : _("Add a directory to export"),
],
"delete" : $[
"handler" : NfsServerDeleteHandler,
- // command line action help
"help" : _("Delete a directory from export"),
+ ],
+ "set" : $[
+ "handler" : NfsServerSetOptionHandler,
+ "help" : _("Set parameters - domain, security and enablev4"),
]
],
"options" : $[
"mountpoint" : $[
"type" : "string",
- // command line option help
"help" : _("Directory to export"),
],
"hosts" : $[
"type" : "string",
- // command line option help
"help" : _("Host wild card for setting the access to directory"),
],
"options" : $[
"type" : "string",
// command line option help (do not transl. 'man exports')
"help" : _("Export options (see 'man exports')"),
-
],
+ "domain" : $[
+ "type" : "string",
+ "help" : _("Domain specification for NFSv4 Idmapping, such as 'localdomain' or 'abc.com' etc."),
+ ],
+ "enablev4" : $[
+ "type" : "string",
+ "help" : _("Yes/No option for enabling/disabling support for NFSv4"),
+ ],
+ "security" : $[
+ "type" : "string",
+ "help" : _("Yes/No option for enabling/disabling secure NFS"),
+ ]
],
"mappings" : $[
"summary" : [],
"start" : [],
"stop" : [],
"add" : [ "mountpoint", "hosts", "options" ],
- "delete" : [ "mountpoint" ]
+ "delete" : [ "mountpoint" ],
+ "set" : [ "enablev4", "domain", "security"]
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-server-2.15.2/src/NfsServer.ycp new/yast2-nfs-server-2.15.3/src/NfsServer.ycp
--- old/yast2-nfs-server-2.15.2/src/NfsServer.ycp 2007-02-26 16:36:29.000000000 +0100
+++ new/yast2-nfs-server-2.15.3/src/NfsServer.ycp 2007-03-16 11:33:15.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: NfsServer.ycp 36506 2007-02-26 15:36:26Z mvidner $
+ * $Id: NfsServer.ycp 37001 2007-03-16 10:33:13Z mvidner $
*
*/
@@ -68,13 +68,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;
/**
@@ -155,13 +155,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