Skip to content

Commit

Permalink
glusterfs: do not set setuid in install
Browse files Browse the repository at this point in the history 
related to #26600
  • Loading branch information
@Mic92
Mic92 committed Jun 18, 2017
1 parent 4eeefad commit ecc34cb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkgs/tools/filesystems/glusterfs/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ rec {
inherit (s) name version;
inherit buildInputs propagatedBuildInputs;

postPatch = ''
sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
'';

patches = [
./glusterfs-use-PATH-instead-of-hardcodes.patch
./glusterfs-fix-unsubstituted-autoconf-macros.patch
Expand Down

5 comments on commit ecc34cb

@emmanuelrosa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be cherry-picked unto the 17.03 release branch?

@bjornfor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is now: e67dd4a

@emmanuelrosa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you :)

@bjornfor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it wasn't me, it was @LnL7 that did the cherry-pick! :-)

@emmanuelrosa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha ha ha! Just when I think I've grokked GitHub, it finds a way to confuse me.

Please sign in to comment.