diff options
| author | Prashanth Pai <ppai@redhat.com> | 2018-04-19 12:50:20 +0530 |
|---|---|---|
| committer | Prashanth Pai <ppai@redhat.com> | 2018-04-19 15:18:40 +0530 |
| commit | 9e7082b756058fe04d79c046fbd6dcbfa75a1716 (patch) | |
| tree | 4a8134dc93284ef8eba606aa8bb773321c22d96f /cli/src | |
| parent | 0043c63f70776444f69667a4ef9596217ecb42b7 (diff) | |
Make glusterfsd binary print statedump & xlator dir
The glusterd2 needs following options, some of which are provided by
gluster CLI today:
--print-xlatordir
--print-statedumpdir
--print-logdir
However, the CLI package need not be present on the machine running
glusterd2. This change adds the above CLI options to glusterfsd binary
which glusterd2 depends on.
Reverts 9a1ae47c8d60836ae0628a04a153f28c1085c0e8
Related changes:
https://review.gluster.org/#/c/19882/
https://github.com/gluster/glusterd2/pull/663
Updates: bz#1193929
Change-Id: I18c123b0d3350d2bd4f2400783e3b94e402a4e29
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/Makefile.am | 1 | ||||
| -rw-r--r-- | cli/src/cli.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 63e3409165d..c6323e591de 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_builddir)/rpc/xdr/src\ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ - -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ $(XML_CPPFLAGS) diff --git a/cli/src/cli.c b/cli/src/cli.c index 7903b57edb6..b58f211d3dd 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -338,12 +338,6 @@ cli_opt_parse (char *opt, struct cli_state *state) exit (0); } - /* XLATORDIR passed through a -D flag to GCC */ - if (strcmp (opt, "print-xlatordir") == 0) { - cli_out ("%s", XLATORDIR); - exit (0); - } - if (strcmp (opt, "xml") == 0) { #if (HAVE_LIB_XML) state->mode |= GLUSTER_MODE_XML; |