|
 |
75c26a1 |
diff -up nfs-utils-1.2.2/configure.ac.orig nfs-utils-1.2.2/configure.ac
|
|
|
75c26a1 |
--- nfs-utils-1.2.2/configure.ac.orig 2010-02-18 07:35:00.000000000 -0500
|
|
|
75c26a1 |
+++ nfs-utils-1.2.2/configure.ac 2010-02-18 09:15:24.710128679 -0500
|
|
|
a658956 |
@@ -22,6 +22,14 @@ AC_ARG_WITH(statedir,
|
|
|
a658956 |
statedir=$withval,
|
|
|
a658956 |
statedir=/var/lib/nfs)
|
|
|
a658956 |
AC_SUBST(statedir)
|
|
|
a658956 |
+AC_ARG_WITH(statdpath,
|
|
|
a658956 |
+ [AC_HELP_STRING([--with-statdpath=/foo],
|
|
|
a658956 |
+ [Causes statd put it's state file in /foo instead of statedir]
|
|
|
a658956 |
+ )],
|
|
|
a658956 |
+ statdpath=$withval,
|
|
|
a658956 |
+ statdpath=""
|
|
|
a658956 |
+ )
|
|
|
a658956 |
+ AC_SUBST(statdpath)
|
|
|
a658956 |
AC_ARG_WITH(statduser,
|
|
|
a658956 |
[AC_HELP_STRING([--with-statduser=rpcuser],
|
|
|
a658956 |
[statd to run under @<:@rpcuser or nobody@:>@]
|
|
|
75c26a1 |
@@ -364,6 +372,9 @@ dnl ************************************
|
|
|
a658956 |
dnl Export some path names to config.h
|
|
|
a658956 |
dnl *************************************************************
|
|
|
a658956 |
AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir", [This defines the location of the NFS state files. Warning: this must match definitions in config.mk!])
|
|
|
a658956 |
+if test "$statdpath" != ""; then
|
|
|
a658956 |
+ AC_DEFINE_UNQUOTED(NSM_STATD_PATH, "$statdpath", [Define this if you what statd file placed in somewhere other than NFS_STATEDIR])
|
|
|
a658956 |
+fi
|
|
|
a658956 |
|
|
|
a658956 |
if test "x$cross_compiling" = "xno"; then
|
|
|
a658956 |
CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
|
|
|
75c26a1 |
diff -up nfs-utils-1.2.2/support/nsm/file.c.orig nfs-utils-1.2.2/support/nsm/file.c
|
|
|
75c26a1 |
--- nfs-utils-1.2.2/support/nsm/file.c.orig 2010-02-18 07:35:00.000000000 -0500
|
|
|
75c26a1 |
+++ nfs-utils-1.2.2/support/nsm/file.c 2010-02-18 09:15:24.711128045 -0500
|
|
|
80be375 |
@@ -93,12 +93,13 @@
|
|
|
a658956 |
#define NSM_KERNEL_STATE_FILE "/proc/sys/fs/nfs/nsm_local_state"
|
|
|
a658956 |
|
|
|
a658956 |
/*
|
|
|
a658956 |
- * Some distributions place statd's files in a subdirectory
|
|
|
a658956 |
+ * Allow different places for statd's files
|
|
|
a658956 |
*/
|
|
|
a658956 |
-#define NSM_PATH_EXTENSION
|
|
|
a658956 |
-/* #define NSM_PATH_EXTENSION "/statd" */
|
|
|
a658956 |
-
|
|
|
a658956 |
-#define NSM_DEFAULT_STATEDIR NFS_STATEDIR NSM_PATH_EXTENSION
|
|
|
a658956 |
+#ifdef NSM_STATD_PATH
|
|
|
a658956 |
+#define NSM_DEFAULT_STATEDIR NSM_STATD_PATH
|
|
|
a658956 |
+#else
|
|
|
a658956 |
+#define NSM_DEFAULT_STATEDIR NFS_STATEDIR
|
|
|
a658956 |
+#endif
|
|
|
a658956 |
|
|
|
a658956 |
static char nsm_base_dirname[PATH_MAX] = NSM_DEFAULT_STATEDIR;
|
|
|
a658956 |
|