Currently some distributions patch nfs-utils to put NSM state in a
subdirectory of /var/lib/nfs. Make this a configure option instead.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
---
configure.ac | 8 ++++++++
support/nsm/file.c | 9 +--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 461a96a..ba704e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,14 @@ AC_ARG_WITH(statedir,
statedir=$withval,
statedir=/var/lib/nfs)
AC_SUBST(statedir)
+AC_ARG_WITH(statd-extension,
+ [AC_HELP_STRING([--with-statd-extension=foo],
+ [Put NSM state in subdir foo of statedir])],
+ statdext=$withval,
+ statdext="")
+ AC_SUBST(statdext)
+ AC_DEFINE_UNQUOTED(NSM_PATH_EXTENSION, "$statdext",
+ [This defines the statedir subdirectory containing NSM state files.])
AC_ARG_WITH(statduser,
[AC_HELP_STRING([--with-statduser=rpcuser],
[statd to run under @<:@rpcuser or nobody@:>@]
diff --git a/support/nsm/file.c b/support/nsm/file.c
index a12c753..b4a5af1 100644
--- a/support/nsm/file.c
+++ b/support/nsm/file.c
@@ -93,14 +93,7 @@
#define LINELEN (RPCARGSLEN + SM_PRIV_SIZE * 2 + 1)
#define NSM_KERNEL_STATE_FILE "/proc/sys/fs/nfs/nsm_local_state"
-
-/*
- * Some distributions place statd's files in a subdirectory
- */
-#define NSM_PATH_EXTENSION
-/* #define NSM_PATH_EXTENSION "/statd" */
-
-#define NSM_DEFAULT_STATEDIR NFS_STATEDIR NSM_PATH_EXTENSION
+#define NSM_DEFAULT_STATEDIR NFS_STATEDIR "/" NSM_PATH_EXTENSION
static char nsm_base_dirname[PATH_MAX] = NSM_DEFAULT_STATEDIR;
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
