diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2017-09-08 03:49:33 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2017-09-08 04:29:13 +0200 |
| commit | e7325f82a32cea8d7e6cfafff9e61e4468fd19dc (patch) | |
| tree | 599e191733a76ae0cb562b3bd2893dc8385a8b18 /pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch | |
| parent | 8e329da496f8e7f3c5b95c721b7a95317f5854c4 (diff) | |
| download | nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.tar nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.tar.gz nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.tar.bz2 nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.tar.lz nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.tar.xz nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.tar.zst nixpkgs-e7325f82a32cea8d7e6cfafff9e61e4468fd19dc.zip | |
glusterfs: Patch upstream bug preventing glusterfind from running.
See: https://bugzilla.redhat.com/show_bug.cgi?id=1489610 Also add patch to correctly log stderr from remote nodes when glusterfind fails. This, too, should be removed when fixed upstream.
Diffstat (limited to 'pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch')
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch new file mode 100644 index 00000000000..8a3da0d6db7 --- /dev/null +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -0,0 +1,27 @@ +From 965eb1e08e10ff82bb91d485dc24672acc7c72cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> +Date: Fri, 8 Sep 2017 00:51:53 +0200 +Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of + localstatedir". Fixes #1489610 + +Change-Id: I6d71297fb7a5a9d12cc3726b4a4ad94efcd644f9 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0c3a38689..d508fda71 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1057,7 +1057,7 @@ if test "x$prefix" = xNONE; then + prefix=$ac_default_prefix + fi + GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" +-GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" ++GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" + prefix=$old_prefix + + ### Dirty hacky stuff to make LOCALSTATEDIR work +-- +2.12.0 + |