diff options
| author | Niels de Vos <ndevos@redhat.com> | 2017-03-20 17:24:37 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2017-03-27 07:57:04 -0400 |
| commit | 16cfe427397d5b8f7a66dfe0b86d9fa5b06de4c1 (patch) | |
| tree | fee71a58afb619411ddc9a807b092abc40bc7d49 | |
| parent | b96da537f60d75f896973c9f61007baec42fcf17 (diff) | |
nfs: use pkill on all OS's
'killall' is the only executable that is needed from the psmisc package
on glusterfs-server installations. NetBSD already uses 'pkill' as
alternative, this can be used everywhere.
BUG: 1197308
Change-Id: Ied671a74b735e321f52d99c869627b957aa2bd02
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://review.gluster.org/16928
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 9 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nlm4.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 134af07707c..6225d12e631 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -473,7 +473,7 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release} Requires: lvm2 >= 2.02.89 Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng Requires: python2 attr dbench file git libacl-devel net-tools -Requires: nfs-utils xfsprogs yajl +Requires: nfs-utils xfsprogs yajl psmisc %description regression-tests The Gluster Test Framework, is a suite of scripts used for @@ -523,9 +523,7 @@ Requires: %{name}-fuse%{?_isa} = %{version}-%{release} # self-heal daemon, rebalance, nfs-server etc. are actually clients Requires: %{name}-api%{?_isa} = %{version}-%{release} Requires: %{name}-client-xlators%{?_isa} = %{version}-%{release} -# psmisc for killall, lvm2 for snapshot, and nfs-utils and -# rpcbind/portmap for gnfs server -Requires: psmisc +# lvm2 for snapshot, and nfs-utils and rpcbind/portmap for gnfs server Requires: lvm2 Requires: nfs-utils %if ( 0%{?_with_systemd:1} ) @@ -1250,6 +1248,9 @@ exit 0 %endif %changelog +* Mon Mar 20 2017 Niels de Vos <ndevos@redhat.com> +- Drop dependency on psmisc, pkill is used instead of killall (#1197308) + * Thu Feb 16 2017 Niels de Vos <ndevos@redhat.com> - Obsolete and Provide python-gluster for upgrading from glusterfs < 3.10 diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c index 3da3b2d1c05..8db149cece5 100644 --- a/xlators/nfs/server/src/nlm4.c +++ b/xlators/nfs/server/src/nlm4.c @@ -37,11 +37,7 @@ #include <rpc/xdr.h> #include <statedump.h> -#ifdef __NetBSD__ #define KILLALL_CMD "pkill" -#else -#define KILLALL_CMD "killall" -#endif /* TODO: * 1) 2 opens racing .. creating an fd leak. |