JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #87417 from helsinki-systems/fix/glusterfs_snapshots

Browse Source 
glusterfs: fix snapshots
This commit is contained in:
Michael Raskin 2020-05-09 20:40:21 +00:00 committed by GitHub
commit e15ab2cda7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/tools/filesystems/glusterfs/default.nix
View File

@ -73,19 +73,25 @@ stdenv.mkDerivation
postPatch = '' postPatch = ''
sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \
--replace '/sbin/' '${lvm2}/bin/'
substituteInPlace libglusterfs/src/glusterfs/compat.h \
--replace '/bin/umount' '${utillinux}/bin/umount'
substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \
--replace '/bin/mount' '${utillinux}/bin/mount'
''; '';
# Note that the VERSION file is something that is present in release tarballs # Note that the VERSION file is something that is present in release tarballs
# but not in git tags (at least not as of writing in v3.10.1). # but not in git tags (at least not as of writing in v3.10.1).
# That's why we have to create it. # That's why we have to create it.
# Without this, gluster (at least 3.10.1) will fail very late and cryptically, # Without this, gluster (at least 3.10.1) will fail very late and cryptically,
# for example when setting up geo-replication, with a message like # for example when setting up geo-replication, with a message like
# Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume.
# What happens here is that the gverify.sh script tries to compare the versions, # What happens here is that the gverify.sh script tries to compare the versions,
# but fails when the version is empty. # but fails when the version is empty.
# See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
preConfigure = '' preConfigure = ''
echo "v${s.version}" > VERSION echo "v${s.version}" > VERSION
./autogen.sh ./autogen.sh
export PYTHON=${python3}/bin/python export PYTHON=${python3}/bin/python
''; '';