diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2019-04-01 09:03:12 -0400 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2019-04-23 11:45:44 +0000 |
| commit | 17992b69ccc729d59241ceff2aa480d1976e02fc (patch) | |
| tree | 53a8c24b3902319129d4c2a0c01f7adbe43dc0e1 | |
| parent | 4f0db1373be93e05b6fc451d2f07514704d3c4ca (diff) | |
build: conditional rpcbind for gnfs in glusterd.service
Don't Require: rpcbind in glusterd.service when gnfs isn't built
Also add .../gluster-ta-volume.service to .gitignore
See https://github.com/gluster/glusterfs/issues/647
Change-Id: I4d90cf66b12c378c0a9aace89a3a4bbf3784c284
Fixes: #647
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | extras/systemd/glusterd.service.in | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 4b369515d3e..8e05080c947 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ extras/ocf/glusterd extras/ocf/volume extras/run-gluster.tmpfiles extras/systemd/glusterd.service +extras/systemd/gluster-ta-volume.service extras/systemd/glusterfssharedstorage.service extras/who-wrote-glusterfs/gitdm geo-replication/.tox diff --git a/configure.ac b/configure.ac index 89e330aaada..5d1e7bd6ead 100644 --- a/configure.ac +++ b/configure.ac @@ -1347,14 +1347,17 @@ fi dnl gnfs section BUILD_GNFS="no" +RPCBIND_SERVICE="" AC_ARG_ENABLE([gnfs], AC_HELP_STRING([--enable-gnfs], [Enable legacy gnfs server xlator.])) if test "x${with_server}" = "xyes" -a "x$enable_gnfs" = "xyes"; then BUILD_GNFS="yes" + RPCBIND_SERVICE="rpcbind.service" fi AM_CONDITIONAL([BUILD_GNFS], [test x$BUILD_GNFS = xyes]) AC_SUBST(BUILD_GNFS) +AC_SUBST(RPCBIND_SERVICE) dnl end gnfs section dnl Check for userspace-rcu diff --git a/extras/systemd/glusterd.service.in b/extras/systemd/glusterd.service.in index c33351cb43b..89ef402ac83 100644 --- a/extras/systemd/glusterd.service.in +++ b/extras/systemd/glusterd.service.in @@ -1,8 +1,8 @@ [Unit] Description=GlusterFS, a clustered file-system server Documentation=man:glusterd(8) -Requires=rpcbind.service -After=network.target rpcbind.service +Requires=@RPCBIND_SERVICE@ +After=network.target @RPCBIND_SERVICE@ Before=network-online.target [Service] |