|
 |
3604df |
From fd2b5cb2ba62aac2bf1c466074f233ec17168594 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Date: Tue, 30 Aug 2016 18:36:51 +0530
|
|
|
3604df |
Subject: [PATCH 68/86] ganesha/glusterd : Correct the path for ganesha conf dir in Makefile
|
|
|
3604df |
|
|
|
3604df |
The value for ganesha conf dir in Makefile.am is mistakenly entered as
|
|
|
3604df |
following :
|
|
|
3604df |
DCONFDIR=\"/$(runstatedir)/gluster/shared_storage/nfs-ganesha\"
|
|
|
3604df |
|
|
|
3604df |
Here value for runstatedir is seems to "NULL" which results wrong path
|
|
|
3604df |
for ganesha configuration directory
|
|
|
3604df |
|
|
|
3604df |
Upstream reference :
|
|
|
3604df |
>Change-Id: I0b7ebd8e2503de0cb79b601553c4405d0d1fd711
|
|
|
3604df |
>BUG: 1355956
|
|
|
3604df |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15355
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
3604df |
>Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I0b7ebd8e2503de0cb79b601553c4405d0d1fd711
|
|
|
3604df |
BUG: 1348949
|
|
|
3604df |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/84840
|
|
|
3604df |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
xlators/mgmt/glusterd/src/Makefile.am | 2 +-
|
|
|
3604df |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
|
|
|
3604df |
index faee862..33a1fc4 100644
|
|
|
3604df |
--- a/xlators/mgmt/glusterd/src/Makefile.am
|
|
|
3604df |
+++ b/xlators/mgmt/glusterd/src/Makefile.am
|
|
|
3604df |
@@ -48,7 +48,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
|
|
|
3604df |
-I$(CONTRIBDIR)/userspace-rcu \
|
|
|
3604df |
-DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \
|
|
|
3604df |
-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \
|
|
|
3604df |
- -DCONFDIR=\"/$(runstatedir)/gluster/shared_storage/nfs-ganesha\" \
|
|
|
3604df |
+ -DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \
|
|
|
3604df |
-DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \
|
|
|
3604df |
-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS)
|
|
|
3604df |
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|