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