commit 87ee5896fb46203ca26af9b22c6b524cc1de195f · pyrox.dev/nixpkgs

+4 -1

nixos/modules/services/network-filesystems/glusterfs.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         inherit (pkgs) glusterfs;

     

       6
       6
       +
         inherit (pkgs) glusterfs rsync;

     

       7
       7
        
       

     

       8
       8
        
         cfg = config.services.glusterfs;

     

       9
       9
        
       

     
···

       50
       50
        
             after = [ "rpcbind.service" "network.target" "local-fs.target" ];

     

       51
       51
        
             before = [ "network-online.target" ];

     

       52
       52
        
       

     

       53
       53
       +
             # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761

     

       53
       54
        
             preStart = ''

     

       54
       55
        
               install -m 0755 -d /var/log/glusterfs

     

       56
       56
       +
               mkdir -p /var/lib/glusterd/hooks/

     

       57
       57
       +
               ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/

     

       55
       58
        
             '';

     

       56
       59
        
       

     

       57
       60
        
             serviceConfig = {

+132 -17

pkgs/tools/filesystems/glusterfs/default.nix

···

       1
       1
        
       {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,

     

       2
       2
       -
        autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite

     

       3
       3
       -
        , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which

     

       2
       2
       +
        autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,

     

       3
       3
       +
        liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages,

     

       4
       4
       +
        openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,

     

       5
       5
       +
        rsync, glibc

     

       4
       6
        
       }:

     

       5
       5
       -
       let 

     

       7
       7
       +
       let

     

       6
       8
        
         s =

     

       7
       9
        
         rec {

     

       8
       10
        
           baseName="glusterfs";

     

       9
       9
       -
           version = "3.10.1";

     

       11
       11
       +
           # NOTE: On each glusterfs release, it should be checked if gluster added

     

       12
       12
       +
           #       new, or changed, Python scripts whose PYTHONPATH has to be set in

     

       13
       13
       +
           #       `postFixup` below, and whose runtime deps need to go into

     

       14
       14
       +
           #       `nativeBuildInputs`.

     

       15
       15
       +
           #       The command

     

       16
       16
       +
           #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable

     

       17
       17
       +
           #       can help with finding new Python scripts.

     

       18
       18
       +
           version = "3.10.2";

     

       10
       19
        
           name="${baseName}-${version}";

     

       11
       11
       -
           url="http://download.gluster.org/pub/gluster/glusterfs/3.10/${version}/glusterfs-${version}.tar.gz";

     

       12
       12
       -
           sha256 = "05qmn85lg3d1gz0fhn1v2z7nwl2qwbflvjc8nvkfyr4r57rkvhnk";

     

       20
       20
       +
           url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";

     

       21
       21
       +
           sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs";

     

       13
       22
        
         };

     

       14
       23
        
         buildInputs = [

     

       15
       15
       -
           fuse bison flex_2_5_35 openssl python2 ncurses readline

     

       24
       24
       +
           fuse bison flex_2_5_35 openssl ncurses readline

     

       16
       25
        
           autoconf automake libtool pkgconfig zlib libaio libxml2

     

       17
       26
        
           acl sqlite liburcu attr makeWrapper

     

       27
       27
       +
           (python2.withPackages (pkgs: [

     

       28
       28
       +
             pkgs.flask

     

       29
       29
       +
             pkgs.prettytable

     

       30
       30
       +
             pkgs.requests

     

       31
       31
       +
             pkgs.xattr

     

       32
       32
       +
           ]))

     

       33
       33
       +
           # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`,

     

       34
       34
       +
           #       to ensure that the packages are available but the `toPythonPath`

     

       35
       35
       +
           #       shell function used in `postFixup` is also still available.

     

       36
       36
       +
           python2

     

       18
       37
        
         ];

     

       19
       38
        
         # Some of the headers reference acl

     

       20
       39
        
         propagatedBuildInputs = [

     

       21
       40
        
           acl

     

       22
       41
        
         ];

     

       42
       42
       +
         # Packages from which GlusterFS calls binaries at run-time from PATH,

     

       43
       43
       +
         # with comments on which commands are known to be called by it.

     

       44
       44
       +
         runtimePATHdeps = [

     

       45
       45
       +
           attr # getfattr setfattr

     

       46
       46
       +
           btrfs-progs # btrfs

     

       47
       47
       +
           coreutils # lots of commands in bash scripts

     

       48
       48
       +
           e2fsprogs # tune2fs

     

       49
       49
       +
           findutils # find

     

       50
       50
       +
           gawk # awk

     

       51
       51
       +
           glibc # getent

     

       52
       52
       +
           gnugrep # grep

     

       53
       53
       +
           gnused # sed

     

       54
       54
       +
           lvm2 # lvs

     

       55
       55
       +
           openssh # ssh

     

       56
       56
       +
           rsync # rsync, e.g. for geo-replication

     

       57
       57
       +
           systemd # systemctl

     

       58
       58
       +
           utillinux # mount umount

     

       59
       59
       +
           which # which

     

       60
       60
       +
           xfsprogs # xfs_info

     

       61
       61
       +
         ];

     

       23
       62
        
       in

     

       24
       63
        
       stdenv.mkDerivation

     

       25
       64
        
       rec {

     

       26
       65
        
         inherit (s) name version;

     

       27
       66
        
         inherit buildInputs propagatedBuildInputs;

     

       28
       67
        
       

     

       29
       29
       -
         preConfigure = ''

     

       68
       68
       +
         patches = [

     

       69
       69
       +
           ./glusterfs-use-PATH-instead-of-hardcodes.patch

     

       70
       70
       +
           ./glusterfs-fix-unsubstituted-autoconf-macros.patch

     

       71
       71
       +
           ./glusterfs-python-remove-find_library.patch

     

       72
       72
       +
         ];

     

       73
       73
       +
       

     

       74
       74
       +
          # Note that the VERSION file is something that is present in release tarballs

     

       75
       75
       +
          # but not in git tags (at least not as of writing in v3.10.1).

     

       76
       76
       +
          # That's why we have to create it.

     

       77
       77
       +
          # Without this, gluster (at least 3.10.1) will fail very late and cryptically,

     

       78
       78
       +
          # for example when setting up geo-replication, with a message like

     

       79
       79
       +
          #   Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume.

     

       80
       80
       +
          # What happens here is that the gverify.sh script tries to compare the versions,

     

       81
       81
       +
          # but fails when the version is empty.

     

       82
       82
       +
          # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705

     

       83
       83
       +
          preConfigure = ''

     

       84
       84
       +
            echo "v${s.version}" > VERSION

     

       30
       85
        
           ./autogen.sh

     

       31
       86
        
           '';

     

       32
       87
        
       

     
···

       36
       91
        
       

     

       37
       92
        
         makeFlags = "DESTDIR=$(out)";

     

       38
       93
        
       

     

       39
       39
       -
         preInstall = ''

     

       40
       40
       -
           substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out

     

       41
       41
       -
           substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out

     

       42
       42
       -
           substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out

     

       43
       43
       -
           substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out

     

       44
       44
       -
           substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out

     

       45
       45
       -
           '';

     

       94
       94
       +
         enableParallelBuilding = true;

     

       46
       95
        
       

     

       47
       96
        
         postInstall = ''

     

       48
       97
        
           cp -r $out/$out/* $out

     

       49
       98
        
           rm -r $out/nix

     

       50
       50
       -
           wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}"

     

       99
       99
       +
           '';

     

       100
       100
       +
       

     

       101
       101
       +
         postFixup = ''

     

       102
       102
       +
           # glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands.

     

       103
       103
       +
           # For example for `peer_georep-sshkey` key generation, so `$out/bin` is needed in the PATH.

     

       104
       104
       +
           # It also invokes bash scripts like `gverify.sh`.

     

       105
       105
       +
           # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly.

     

       106
       106
       +
           # We set up the paths for the main entry point executables.

     

       107
       107
       +
       

     

       108
       108
       +
           GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin"

     

       109
       109
       +
           GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs"

     

       110
       110
       +
           GLUSTER_LD_LIBRARY_PATH="$out/lib"

     

       111
       111
       +
       

     

       112
       112
       +
           wrapProgram $out/bin/glusterd --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       113
       113
       +
           wrapProgram $out/bin/gluster --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       114
       114
       +
           wrapProgram $out/sbin/mount.glusterfs --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       115
       115
       +
       

     

       116
       116
       +
           # Set Python environment for the Python based utilities.

     

       117
       117
       +
           # It would be nice if there was a better way to do this, automatically for all of them.

     

       118
       118
       +
           # Also, this is brittle: If we forget a dependency or gluster adds a new one, things will break deep inside gluster.

     

       119
       119
       +
           # We should better try to get an explicit list of Python dependencies from gluster and ensure all of them are in the PYTHONPATH of all these python scripts.

     

       120
       120
       +
           # But at the time of writing (gluster 3.10), gluster only provides this in form of a gluster.spec file for RPM creation,

     

       121
       121
       +
           # and even that one is not complete (for example it doesn't mention the `flask` dependency).

     

       122
       122
       +
       

     

       123
       123
       +
           wrapProgram $out/bin/gluster-eventsapi --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       124
       124
       +
           wrapProgram $out/bin/gluster-georep-sshkey --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       125
       125
       +
           wrapProgram $out/bin/gluster-mountbroker --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       126
       126
       +
           wrapProgram $out/bin/glusterfind --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       127
       127
       +
       

     

       128
       128
       +
           # Note that we only wrap the symlinks in $out/bin, not the actual executable scripts in $out/libexec/glusterfs.

     

       129
       129
       +
           # This is because those scripts use `__file__` in their program logic

     

       130
       130
       +
           # (see https://github.com/gluster/glusterfs/blob/v3.10.1/extras/cliutils/cliutils.py#L116)

     

       131
       131
       +
           # which would break if we changed the file name (which is what `wrapProgram` does).

     

       132
       132
       +
           # Luckily, `libexec` scripts are never supposed to be invoked straight from PATH,

     

       133
       133
       +
           # instead they are invoked directly from `gluster` or `glusterd`, which is why it is

     

       134
       134
       +
           # sufficient to set PYTHONPATH for those executables.

     

       135
       135
       +
       

     

       136
       136
       +
           wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"

     

       137
       137
       +
           '';

     

       138
       138
       +
       

     

       139
       139
       +
         doInstallCheck = true;

     

       140
       140
       +
       

     

       141
       141
       +
         # Below we run Python programs. That generates .pyc/.pyo files.

     

       142
       142
       +
         # By default they are indeterministic because such files contain time stamps

     

       143
       143
       +
         # (see https://nedbatchelder.com/blog/200804/the_structure_of_pyc_files.html).

     

       144
       144
       +
         # So we use the same environment variables as in

     

       145
       145
       +
         #   https://github.com/NixOS/nixpkgs/blob/249b34aadca7038207492f29142a3456d0cecec3/pkgs/development/interpreters/python/mk-python-derivation.nix#L61

     

       146
       146
       +
         # to make these files deterministic.

     

       147
       147
       +
         # A general solution to this problem might be brought by #25707.

     

       148
       148
       +
         DETERMINISTIC_BUILD = 1;

     

       149
       149
       +
         PYTHONHASHSEED = 0;

     

       150
       150
       +
       

     

       151
       151
       +
         installCheckPhase = ''

     

       152
       152
       +
           # Tests that the above programs work without import errors.

     

       153
       153
       +
           # For testing it manually in a shell you may want to substitute `$out` with `$(dirname $(readlink -f $(which gluster)))/../`.

     

       154
       154
       +
           $out/bin/glusterd --help

     

       155
       155
       +
           # $out/bin/gluster help # can't do this because even `gluster help` tries to write to `/var/log/glusterfs/cli.log`

     

       156
       156
       +
           $out/bin/gluster-eventsapi --help

     

       157
       157
       +
           $out/bin/gluster-georep-sshkey --help

     

       158
       158
       +
           $out/bin/gluster-mountbroker --help

     

       159
       159
       +
           $out/bin/glusterfind --help

     

       160
       160
       +
           # gfid_to_path.py doesn't accept --help, and it requires different arguments

     

       161
       161
       +
           # (a dir as single argument) than the usage prints when stdin is not a TTY.

     

       162
       162
       +
           # The `echo ""` is just so that stdin is not a TTY even if you try this line

     

       163
       163
       +
           # on a real TTY for testing purposes.

     

       164
       164
       +
           echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path)

     

       165
       165
       +
           $out/share/glusterfs/scripts/eventsdash.py --help

     

       51
       166
        
           '';

     

       52
       167
        
       

     

       53
       168
        
         src = fetchurl {

     
···

       60
       175
        
           maintainers = [

     

       61
       176
        
             stdenv.lib.maintainers.raskin

     

       62
       177
        
           ];

     

       63
       63
       -
           platforms = with stdenv.lib.platforms; 

     

       178
       178
       +
           platforms = with stdenv.lib.platforms;

     

       64
       179
        
             linux ++ freebsd;

     

       65
       180
        
         };

     

       66
       181
        
       }

+236

pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch

···

       1
       1
       +
       From b37e0222a6a60505868a6fbb8591608cdc4bba57 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>

     

       3
       3
       +
       Date: Sat, 13 May 2017 15:33:27 +0200

     

       4
       4
       +
       Subject: [PATCH] Revert "build/packaging: Debian and Ubuntu don't have

     

       5
       5
       +
        /usr/libexec". Fixes #1450588

     

       6
       6
       +
       

     

       7
       7
       +
       This reverts commit 18509e436f8a728ef522f3e76e2f2dc30e1bd8ac.

     

       8
       8
       +
       

     

       9
       9
       +
       This fixes autoconf unsubstituted strings to appear in generated source code.

     

       10
       10
       +
       ---

     

       11
       11
       +
        cli/src/Makefile.am                      |  2 +-

     

       12
       12
       +
        configure.ac                             | 12 ++++++------

     

       13
       13
       +
        events/src/Makefile.am                   |  8 ++++----

     

       14
       14
       +
        extras/Makefile.am                       |  2 +-

     

       15
       15
       +
        geo-replication/src/Makefile.am          |  8 ++++----

     

       16
       16
       +
        geo-replication/syncdaemon/Makefile.am   |  2 +-

     

       17
       17
       +
        tools/gfind_missing_files/Makefile.am    |  4 ++--

     

       18
       18
       +
        tools/glusterfind/Makefile.am            |  4 ++--

     

       19
       19
       +
        tools/glusterfind/src/Makefile.am        |  2 +-

     

       20
       20
       +
        xlators/features/ganesha/src/Makefile.am |  2 +-

     

       21
       21
       +
        xlators/mgmt/glusterd/src/Makefile.am    |  2 +-

     

       22
       22
       +
        11 files changed, 24 insertions(+), 24 deletions(-)

     

       23
       23
       +
       

     

       24
       24
       +
       diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am

     

       25
       25
       +
       index 5ef9389..f5b8d00 100644

     

       26
       26
       +
       --- a/cli/src/Makefile.am

     

       27
       27
       +
       +++ b/cli/src/Makefile.am

     

       28
       28
       +
       @@ -18,7 +18,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \

     

       29
       29
       +
        	-I$(top_builddir)/rpc/xdr/src\

     

       30
       30
       +
        	-DDATADIR=\"$(localstatedir)\" \

     

       31
       31
       +
        	-DCONFDIR=\"$(sysconfdir)/glusterfs\" \

     

       32
       32
       +
       -	-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\

     

       33
       33
       +
       +	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\

     

       34
       34
       +
        	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\

     

       35
       35
       +
        	$(XML_CPPFLAGS)

     

       36
       36
       +
        

     

       37
       37
       +
       diff --git a/configure.ac b/configure.ac

     

       38
       38
       +
       index c9742e2..0c3a386 100644

     

       39
       39
       +
       --- a/configure.ac

     

       40
       40
       +
       +++ b/configure.ac

     

       41
       41
       +
       @@ -1056,24 +1056,24 @@ old_prefix=$prefix

     

       42
       42
       +
        if test "x$prefix" = xNONE; then

     

       43
       43
       +
        	prefix=$ac_default_prefix

     

       44
       44
       +
        fi

     

       45
       45
       +
       -GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs"

     

       46
       46
       +
       -GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd"

     

       47
       47
       +
       +GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs"

     

       48
       48
       +
       +GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"

     

       49
       49
       +
        prefix=$old_prefix

     

       50
       50
       +
        

     

       51
       51
       +
        ### Dirty hacky stuff to make LOCALSTATEDIR work

     

       52
       52
       +
        if test "x$prefix" = xNONE; then

     

       53
       53
       +
       -   test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var

     

       54
       54
       +
       +   test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var

     

       55
       55
       +
           localstatedir=/var

     

       56
       56
       +
       -   LOCALSTATEDIR=$localstatedir

     

       57
       57
       +
       +   LOCALSTATEDIR=$(eval echo ${localstatedir})

     

       58
       58
       +
        else

     

       59
       59
       +
       -   LOCALSTATEDIR=$localstatedir

     

       60
       60
       +
       +   LOCALSTATEDIR=$(eval echo ${localstatedir})

     

       61
       61
       +
        fi

     

       62
       62
       +
        

     

       63
       63
       +
        old_prefix=$prefix

     

       64
       64
       +
        if test "x$prefix" = xNONE; then

     

       65
       65
       +
            prefix=$ac_default_prefix

     

       66
       66
       +
        fi

     

       67
       67
       +
       -GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol"

     

       68
       68
       +
       +GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol"

     

       69
       69
       +
        prefix=$old_prefix

     

       70
       70
       +
        

     

       71
       71
       +
        

     

       72
       72
       +
       diff --git a/events/src/Makefile.am b/events/src/Makefile.am

     

       73
       73
       +
       index 8493abd..87282c6 100644

     

       74
       74
       +
       --- a/events/src/Makefile.am

     

       75
       75
       +
       +++ b/events/src/Makefile.am

     

       76
       76
       +
       @@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py  eventsapiconf.py.in \

     

       77
       77
       +
        BUILT_SOURCES = eventtypes.py

     

       78
       78
       +
        CLEANFILES = eventtypes.py

     

       79
       79
       +
        

     

       80
       80
       +
       -eventsdir = $(GLUSTERFS_LIBEXECDIR)/events

     

       81
       81
       +
       +eventsdir = $(libexecdir)/glusterfs/events

     

       82
       82
       +
        events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \

     

       83
       83
       +
        	utils.py

     

       84
       84
       +
        

     

       85
       85
       +
       @@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py

     

       86
       86
       +
        	$(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER

     

       87
       87
       +
        

     

       88
       88
       +
        if BUILD_EVENTS

     

       89
       89
       +
       -eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR)

     

       90
       90
       +
       +eventspeerscriptdir = $(libexecdir)/glusterfs

     

       91
       91
       +
        eventsconfdir = $(sysconfdir)/glusterfs

     

       92
       92
       +
        eventsconf_DATA = eventsconfig.json

     

       93
       93
       +
        

     

       94
       94
       +
       @@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py

     

       95
       95
       +
        install-exec-hook:

     

       96
       96
       +
        	$(mkdir_p) $(DESTDIR)$(sbindir)

     

       97
       97
       +
        	rm -f $(DESTDIR)$(sbindir)/glustereventsd

     

       98
       98
       +
       -	ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \

     

       99
       99
       +
       +	ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \

     

       100
       100
       +
        		$(DESTDIR)$(sbindir)/glustereventsd

     

       101
       101
       +
        	rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi

     

       102
       102
       +
       -	ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \

     

       103
       103
       +
       +	ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \

     

       104
       104
       +
        		$(DESTDIR)$(sbindir)/gluster-eventsapi

     

       105
       105
       +
        

     

       106
       106
       +
        uninstall-hook:

     

       107
       107
       +
       diff --git a/extras/Makefile.am b/extras/Makefile.am

     

       108
       108
       +
       index 9dfc93d..53ac476 100644

     

       109
       109
       +
       --- a/extras/Makefile.am

     

       110
       110
       +
       +++ b/extras/Makefile.am

     

       111
       111
       +
       @@ -1,4 +1,4 @@

     

       112
       112
       +
       -addonexecdir = $(GLUSTERFS_LIBEXECDIR)

     

       113
       113
       +
       +addonexecdir = $(libexecdir)/glusterfs

     

       114
       114
       +
        addonexec_SCRIPTS = peer_add_secret_pub

     

       115
       115
       +
        

     

       116
       116
       +
        EditorModedir = $(docdir)

     

       117
       117
       +
       diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am

     

       118
       118
       +
       index 9937a0b..87435d5 100644

     

       119
       119
       +
       --- a/geo-replication/src/Makefile.am

     

       120
       120
       +
       +++ b/geo-replication/src/Makefile.am

     

       121
       121
       +
       @@ -1,4 +1,4 @@

     

       122
       122
       +
       -gsyncddir = $(GLUSTERFS_LIBEXECDIR)

     

       123
       123
       +
       +gsyncddir = $(libexecdir)/glusterfs

     

       124
       124
       +
        

     

       125
       125
       +
        gsyncd_SCRIPTS = gverify.sh peer_gsec_create \

     

       126
       126
       +
        	set_geo_rep_pem_keys.sh peer_mountbroker peer_mountbroker.py \

     

       127
       127
       +
       @@ -21,7 +21,7 @@ noinst_HEADERS = procdiggy.h

     

       128
       128
       +
        

     

       129
       129
       +
        AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \

     

       130
       130
       +
        	-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \

     

       131
       131
       +
       -	-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \

     

       132
       132
       +
       +	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" -DUSE_LIBGLUSTERFS \

     

       133
       133
       +
        	-DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\"

     

       134
       134
       +
        

     

       135
       135
       +
        AM_CFLAGS = -Wall $(GF_CFLAGS)

     

       136
       136
       +
       @@ -35,11 +35,11 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la:

     

       137
       137
       +
        install-exec-hook:

     

       138
       138
       +
        	$(mkdir_p) $(DESTDIR)$(sbindir)

     

       139
       139
       +
        	rm -f $(DESTDIR)$(sbindir)/gluster-mountbroker

     

       140
       140
       +
       -	ln -s $(GLUSTERFS_LIBEXECDIR)/peer_mountbroker.py \

     

       141
       141
       +
       +	ln -s $(libexecdir)/glusterfs/peer_mountbroker.py \

     

       142
       142
       +
        		$(DESTDIR)$(sbindir)/gluster-mountbroker

     

       143
       143
       +
        

     

       144
       144
       +
        	rm -f $(DESTDIR)$(sbindir)/gluster-georep-sshkey

     

       145
       145
       +
       -	ln -s $(GLUSTERFS_LIBEXECDIR)/peer_georep-sshkey.py \

     

       146
       146
       +
       +	ln -s $(libexecdir)/glusterfs/peer_georep-sshkey.py \

     

       147
       147
       +
        		$(DESTDIR)$(sbindir)/gluster-georep-sshkey

     

       148
       148
       +
        

     

       149
       149
       +
        

     

       150
       150
       +
       diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am

     

       151
       151
       +
       index f80fb26..7cdaf45 100644

     

       152
       152
       +
       --- a/geo-replication/syncdaemon/Makefile.am

     

       153
       153
       +
       +++ b/geo-replication/syncdaemon/Makefile.am

     

       154
       154
       +
       @@ -1,4 +1,4 @@

     

       155
       155
       +
       -syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon

     

       156
       156
       +
       +syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon

     

       157
       157
       +
        

     

       158
       158
       +
        syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \

     

       159
       159
       +
        	resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \

     

       160
       160
       +
       diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am

     

       161
       161
       +
       index f77f789..043c34c 100644

     

       162
       162
       +
       --- a/tools/gfind_missing_files/Makefile.am

     

       163
       163
       +
       +++ b/tools/gfind_missing_files/Makefile.am

     

       164
       164
       +
       @@ -1,4 +1,4 @@

     

       165
       165
       +
       -gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files

     

       166
       166
       +
       +gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files

     

       167
       167
       +
        

     

       168
       168
       +
        gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \

     

       169
       169
       +
        	gfid_to_path.py

     

       170
       170
       +
       @@ -21,6 +21,6 @@ uninstall-local:

     

       171
       171
       +
        

     

       172
       172
       +
        install-data-local:

     

       173
       173
       +
        	rm -f $(DESTDIR)$(sbindir)/gfind_missing_files

     

       174
       174
       +
       -	ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files

     

       175
       175
       +
       +	ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files

     

       176
       176
       +
        

     

       177
       177
       +
        CLEANFILES =

     

       178
       178
       +
       diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am

     

       179
       179
       +
       index 92fa614..37f23be 100644

     

       180
       180
       +
       --- a/tools/glusterfind/Makefile.am

     

       181
       181
       +
       +++ b/tools/glusterfind/Makefile.am

     

       182
       182
       +
       @@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind

     

       183
       183
       +
        

     

       184
       184
       +
        CLEANFILES = $(bin_SCRIPTS)

     

       185
       185
       +
        

     

       186
       186
       +
       -deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/

     

       187
       187
       +
       +deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/

     

       188
       188
       +
        deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py

     

       189
       189
       +
        

     

       190
       190
       +
        uninstall-local:

     

       191
       191
       +
       @@ -16,5 +16,5 @@ install-data-local:

     

       192
       192
       +
        	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys

     

       193
       193
       +
        	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/

     

       194
       194
       +
        	rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post

     

       195
       195
       +
       -	ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \

     

       196
       196
       +
       +	ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \

     

       197
       197
       +
        		$(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post

     

       198
       198
       +
       diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am

     

       199
       199
       +
       index e4469c1..541ff94 100644

     

       200
       200
       +
       --- a/tools/glusterfind/src/Makefile.am

     

       201
       201
       +
       +++ b/tools/glusterfind/src/Makefile.am

     

       202
       202
       +
       @@ -1,4 +1,4 @@

     

       203
       203
       +
       -glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind

     

       204
       204
       +
       +glusterfinddir = $(libexecdir)/glusterfs/glusterfind

     

       205
       205
       +
        

     

       206
       206
       +
        glusterfind_PYTHON = conf.py utils.py __init__.py \

     

       207
       207
       +
        	main.py libgfchangelog.py changelogdata.py

     

       208
       208
       +
       diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am

     

       209
       209
       +
       index 78715d6..54cfcb3 100644

     

       210
       210
       +
       --- a/xlators/features/ganesha/src/Makefile.am

     

       211
       211
       +
       +++ b/xlators/features/ganesha/src/Makefile.am

     

       212
       212
       +
       @@ -12,7 +12,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \

     

       213
       213
       +
        	-fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\

     

       214
       214
       +
        	-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \

     

       215
       215
       +
        	-DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \

     

       216
       216
       +
       -	-DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"

     

       217
       217
       +
       +	-DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\"

     

       218
       218
       +
        

     

       219
       219
       +
        AM_CFLAGS = -Wall $(GF_CFLAGS)

     

       220
       220
       +
        

     

       221
       221
       +
       diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am

     

       222
       222
       +
       index 23ebf37..4f2fffd 100644

     

       223
       223
       +
       --- a/xlators/mgmt/glusterd/src/Makefile.am

     

       224
       224
       +
       +++ b/xlators/mgmt/glusterd/src/Makefile.am

     

       225
       225
       +
       @@ -47,7 +47,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \

     

       226
       226
       +
        	-I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/rpc-lib/src \

     

       227
       227
       +
        	-I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \

     

       228
       228
       +
        	-DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \

     

       229
       229
       +
       -	-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \

     

       230
       230
       +
       +	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \

     

       231
       231
       +
        	-DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \

     

       232
       232
       +
        	-DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \

     

       233
       233
       +
        	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS)

     

       234
       234
       +
       -- 

     

       235
       235
       +
       2.7.4

     

       236
       236
       +

+151

pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch

···

       1
       1
       +
       From d321df349d10f038f0c89b9c11f8059572264f1b Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>

     

       3
       3
       +
       Date: Sat, 13 May 2017 18:54:36 +0200

     

       4
       4
       +
       Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593

     

       5
       5
       +
       

     

       6
       6
       +
       `find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6.

     

       7
       7
       +
       ---

     

       8
       8
       +
        api/examples/getvolfile.py                                     |  2 +-

     

       9
       9
       +
        geo-replication/syncdaemon/libcxattr.py                        |  3 +--

     

       10
       10
       +
        geo-replication/syncdaemon/libgfchangelog.py                   |  3 +--

     

       11
       11
       +
        tests/features/ipctest.py                                      | 10 ++--------

     

       12
       12
       +
        tests/utils/libcxattr.py                                       |  5 ++---

     

       13
       13
       +
        tools/glusterfind/src/libgfchangelog.py                        |  3 +--

     

       14
       14
       +
        .../features/changelog/lib/examples/python/libgfchangelog.py   |  3 +--

     

       15
       15
       +
        7 files changed, 9 insertions(+), 20 deletions(-)

     

       16
       16
       +
       

     

       17
       17
       +
       diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py

     

       18
       18
       +
       index 0c95213..32c2268 100755

     

       19
       19
       +
       --- a/api/examples/getvolfile.py

     

       20
       20
       +
       +++ b/api/examples/getvolfile.py

     

       21
       21
       +
       @@ -3,7 +3,7 @@

     

       22
       22
       +
        import ctypes

     

       23
       23
       +
        import ctypes.util

     

       24
       24
       +
        

     

       25
       25
       +
       -api = ctypes.CDLL(ctypes.util.find_library("gfapi"))

     

       26
       26
       +
       +api = ctypes.CDLL("libgfapi.so")

     

       27
       27
       +
        api.glfs_get_volfile.argtypes = [ctypes.c_void_p,

     

       28
       28
       +
                                         ctypes.c_void_p,

     

       29
       29
       +
                                         ctypes.c_ulong]

     

       30
       30
       +
       diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py

     

       31
       31
       +
       index 3671e10..f576648 100644

     

       32
       32
       +
       --- a/geo-replication/syncdaemon/libcxattr.py

     

       33
       33
       +
       +++ b/geo-replication/syncdaemon/libcxattr.py

     

       34
       34
       +
       @@ -10,7 +10,6 @@

     

       35
       35
       +
        

     

       36
       36
       +
        import os

     

       37
       37
       +
        from ctypes import CDLL, create_string_buffer, get_errno

     

       38
       38
       +
       -from ctypes.util import find_library

     

       39
       39
       +
        

     

       40
       40
       +
        

     

       41
       41
       +
        class Xattr(object):

     

       42
       42
       +
       @@ -25,7 +24,7 @@ class Xattr(object):

     

       43
       43
       +
                 sizes we expect

     

       44
       44
       +
            """

     

       45
       45
       +
        

     

       46
       46
       +
       -    libc = CDLL(find_library("c"), use_errno=True)

     

       47
       47
       +
       +    libc = CDLL("libc.so.6", use_errno=True)

     

       48
       48
       +
        

     

       49
       49
       +
            @classmethod

     

       50
       50
       +
            def geterrno(cls):

     

       51
       51
       +
       diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py

     

       52
       52
       +
       index d87b56c..003c28c 100644

     

       53
       53
       +
       --- a/geo-replication/syncdaemon/libgfchangelog.py

     

       54
       54
       +
       +++ b/geo-replication/syncdaemon/libgfchangelog.py

     

       55
       55
       +
       @@ -10,12 +10,11 @@

     

       56
       56
       +
        

     

       57
       57
       +
        import os

     

       58
       58
       +
        from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong

     

       59
       59
       +
       -from ctypes.util import find_library

     

       60
       60
       +
        from syncdutils import ChangelogException, ChangelogHistoryNotAvailable

     

       61
       61
       +
        

     

       62
       62
       +
        

     

       63
       63
       +
        class Changes(object):

     

       64
       64
       +
       -    libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)

     

       65
       65
       +
       +    libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)

     

       66
       66
       +
        

     

       67
       67
       +
            @classmethod

     

       68
       68
       +
            def geterrno(cls):

     

       69
       69
       +
       diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py

     

       70
       70
       +
       index 5aff319..9339248 100755

     

       71
       71
       +
       --- a/tests/features/ipctest.py

     

       72
       72
       +
       +++ b/tests/features/ipctest.py

     

       73
       73
       +
       @@ -1,14 +1,8 @@

     

       74
       74
       +
        #!/usr/bin/python

     

       75
       75
       +
        

     

       76
       76
       +
        import ctypes

     

       77
       77
       +
       -import ctypes.util

     

       78
       78
       +
       -

     

       79
       79
       +
       -# find_library does not lookup LD_LIBRARY_PATH and may miss the

     

       80
       80
       +
       -# function. In that case, retry with less portable but explicit name.

     

       81
       81
       +
       -libgfapi = ctypes.util.find_library("gfapi")

     

       82
       82
       +
       -if libgfapi == None:

     

       83
       83
       +
       -	libgfapi = "libgfapi.so"

     

       84
       84
       +
       -api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL)

     

       85
       85
       +
       +

     

       86
       86
       +
       +api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL)

     

       87
       87
       +
        

     

       88
       88
       +
        api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ]

     

       89
       89
       +
        api.glfs_ipc.restype = ctypes.c_int

     

       90
       90
       +
       diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py

     

       91
       91
       +
       index 149db72..4e6e6c4 100644

     

       92
       92
       +
       --- a/tests/utils/libcxattr.py

     

       93
       93
       +
       +++ b/tests/utils/libcxattr.py

     

       94
       94
       +
       @@ -11,7 +11,6 @@

     

       95
       95
       +
        import os

     

       96
       96
       +
        import sys

     

       97
       97
       +
        from ctypes import CDLL, c_int, create_string_buffer

     

       98
       98
       +
       -from ctypes.util import find_library

     

       99
       99
       +
        

     

       100
       100
       +
        

     

       101
       101
       +
        class Xattr(object):

     

       102
       102
       +
       @@ -28,9 +27,9 @@ class Xattr(object):

     

       103
       103
       +
        

     

       104
       104
       +
            if sys.hexversion >= 0x02060000:

     

       105
       105
       +
                from ctypes import DEFAULT_MODE

     

       106
       106
       +
       -        libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True)

     

       107
       107
       +
       +        libc = CDLL("libc.so.6", DEFAULT_MODE, None, True)

     

       108
       108
       +
            else:

     

       109
       109
       +
       -        libc = CDLL(find_library("libc"))

     

       110
       110
       +
       +        libc = CDLL("libc.so.6")

     

       111
       111
       +
        

     

       112
       112
       +
            @classmethod

     

       113
       113
       +
            def geterrno(cls):

     

       114
       114
       +
       diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py

     

       115
       115
       +
       index dd8153e..da822cf 100644

     

       116
       116
       +
       --- a/tools/glusterfind/src/libgfchangelog.py

     

       117
       117
       +
       +++ b/tools/glusterfind/src/libgfchangelog.py

     

       118
       118
       +
       @@ -12,14 +12,13 @@

     

       119
       119
       +
        import os

     

       120
       120
       +
        from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref

     

       121
       121
       +
        from ctypes import RTLD_GLOBAL

     

       122
       122
       +
       -from ctypes.util import find_library

     

       123
       123
       +
        

     

       124
       124
       +
        

     

       125
       125
       +
        class ChangelogException(OSError):

     

       126
       126
       +
            pass

     

       127
       127
       +
        

     

       128
       128
       +
        

     

       129
       129
       +
       -libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL)

     

       130
       130
       +
       +libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)

     

       131
       131
       +
        

     

       132
       132
       +
        

     

       133
       133
       +
        def raise_oserr():

     

       134
       134
       +
       diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py

     

       135
       135
       +
       index 10e73c0..2cdbf11 100644

     

       136
       136
       +
       --- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py

     

       137
       137
       +
       +++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py

     

       138
       138
       +
       @@ -1,9 +1,8 @@

     

       139
       139
       +
        import os

     

       140
       140
       +
        from ctypes import *

     

       141
       141
       +
       -from ctypes.util import find_library

     

       142
       142
       +
        

     

       143
       143
       +
        class Changes(object):

     

       144
       144
       +
       -    libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)

     

       145
       145
       +
       +    libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)

     

       146
       146
       +
        

     

       147
       147
       +
            @classmethod

     

       148
       148
       +
            def geterrno(cls):

     

       149
       149
       +
       -- 

     

       150
       150
       +
       2.7.4

     

       151
       151
       +

+161

pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch

···

       1
       1
       +
       From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>

     

       3
       3
       +
       Date: Sat, 13 May 2017 02:45:49 +0200

     

       4
       4
       +
       Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes

     

       5
       5
       +
        #1450546.

     

       6
       6
       +
       

     

       7
       7
       +
       Instead, rely on programs to be in PATH, as gluster already

     

       8
       8
       +
       does in many places across its code base.

     

       9
       9
       +
       

     

       10
       10
       +
       Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246

     

       11
       11
       +
       ---

     

       12
       12
       +
        contrib/fuse-lib/mount-common.c               |  8 ++++----

     

       13
       13
       +
        xlators/mgmt/glusterd/src/glusterd-ganesha.c  |  6 +++---

     

       14
       14
       +
        xlators/mgmt/glusterd/src/glusterd-quota.c    |  6 +++---

     

       15
       15
       +
        xlators/mgmt/glusterd/src/glusterd-snapshot.c |  4 ++--

     

       16
       16
       +
        xlators/mgmt/glusterd/src/glusterd-utils.c    | 14 +-------------

     

       17
       17
       +
        5 files changed, 13 insertions(+), 25 deletions(-)

     

       18
       18
       +
       

     

       19
       19
       +
       diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c

     

       20
       20
       +
       index e9f80fe81..6380dd867 100644

     

       21
       21
       +
       --- a/contrib/fuse-lib/mount-common.c

     

       22
       22
       +
       +++ b/contrib/fuse-lib/mount-common.c

     

       23
       23
       +
       @@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,

     

       24
       24
       +
                                exit (1);

     

       25
       25
       +
                        }

     

       26
       26
       +
        #ifdef GF_LINUX_HOST_OS

     

       27
       27
       +
       -                execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,

     

       28
       28
       +
       +                execl ("umount", "umount", "-i", rel_mnt,

     

       29
       29
       +
                               lazy ? "-l" : NULL, NULL);

     

       30
       30
       +
       -                GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",

     

       31
       31
       +
       +                GFFUSE_LOGERR ("%s: failed to execute umount: %s",

     

       32
       32
       +
                                       progname, strerror (errno));

     

       33
       33
       +
        #elif __NetBSD__

     

       34
       34
       +
                        /* exitting the filesystem causes the umount */

     

       35
       35
       +
                        exit (0);

     

       36
       36
       +
        #else

     

       37
       37
       +
       -                execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);

     

       38
       38
       +
       -                GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",

     

       39
       39
       +
       +                execl ("umount", "umount", "-f", rel_mnt, NULL);

     

       40
       40
       +
       +                GFFUSE_LOGERR ("%s: failed to execute umount: %s",

     

       41
       41
       +
                                       progname, strerror (errno));

     

       42
       42
       +
        #endif /* GF_LINUX_HOST_OS */

     

       43
       43
       +
                        exit (1);

     

       44
       44
       +
       diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c

     

       45
       45
       +
       index da1fee066..dcb9e5725 100644

     

       46
       46
       +
       --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c

     

       47
       47
       +
       +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c

     

       48
       48
       +
       @@ -122,15 +122,15 @@ manage_service (char *action)

     

       49
       49
       +
                int     i               = 0;

     

       50
       50
       +
                int     ret             = 0;

     

       51
       51
       +
                struct service_command sc_list[] = {

     

       52
       52
       +
       -                { .binary  = "/bin/systemctl",

     

       53
       53
       +
       +                { .binary  = "systemctl",

     

       54
       54
       +
                          .service = "nfs-ganesha",

     

       55
       55
       +
                          .action  = sc_systemctl_action

     

       56
       56
       +
                        },

     

       57
       57
       +
       -                { .binary  = "/sbin/invoke-rc.d",

     

       58
       58
       +
       +                { .binary  = "invoke-rc.d",

     

       59
       59
       +
                          .service = "nfs-ganesha",

     

       60
       60
       +
                          .action  = sc_service_action

     

       61
       61
       +
                        },

     

       62
       62
       +
       -                { .binary  = "/sbin/service",

     

       63
       63
       +
       +                { .binary  = "service",

     

       64
       64
       +
                          .service = "nfs-ganesha",

     

       65
       65
       +
                          .action  = sc_service_action

     

       66
       66
       +
                        },

     

       67
       67
       +
       diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c

     

       68
       68
       +
       index 0e6629cf0..fcb4738b7 100644

     

       69
       69
       +
       --- a/xlators/mgmt/glusterd/src/glusterd-quota.c

     

       70
       70
       +
       +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c

     

       71
       71
       +
       @@ -30,7 +30,7 @@

     

       72
       72
       +
        

     

       73
       73
       +
        #ifndef _PATH_SETFATTR

     

       74
       74
       +
        # ifdef GF_LINUX_HOST_OS

     

       75
       75
       +
       -#  define _PATH_SETFATTR "/usr/bin/setfattr"

     

       76
       76
       +
       +#  define _PATH_SETFATTR "setfattr"

     

       77
       77
       +
        # endif

     

       78
       78
       +
        # ifdef __NetBSD__

     

       79
       79
       +
        #  define _PATH_SETFATTR "/usr/pkg/bin/setfattr"

     

       80
       80
       +
       @@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,

     

       81
       81
       +
        

     

       82
       82
       +
                        if (type == GF_QUOTA_OPTION_TYPE_ENABLE ||

     

       83
       83
       +
                            type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS)

     

       84
       84
       +
       -                        runner_add_args (&runner, "/usr/bin/find", ".", NULL);

     

       85
       85
       +
       +                        runner_add_args (&runner, "find", ".", NULL);

     

       86
       86
       +
        

     

       87
       87
       +
                        else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {

     

       88
       88
       +
        

     

       89
       89
       +
       @@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,

     

       90
       90
       +
                                                 VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",

     

       91
       91
       +
                                                 "{}", "\\", ";", NULL);

     

       92
       92
       +
        #else

     

       93
       93
       +
       -                        runner_add_args (&runner, "/usr/bin/find", ".",

     

       94
       94
       +
       +                        runner_add_args (&runner, "find", ".",

     

       95
       95
       +
                                                 "-exec", _PATH_SETFATTR, "-n",

     

       96
       96
       +
                                                 VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",

     

       97
       97
       +
                                                 "1", "{}", "\\", ";", NULL);

     

       98
       98
       +
       diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c

     

       99
       99
       +
       index da0152366..f0d135350 100644

     

       100
       100
       +
       --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c

     

       101
       101
       +
       +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c

     

       102
       102
       +
       @@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,

     

       103
       103
       +
                }

     

       104
       104
       +
        

     

       105
       105
       +
                runinit (&runner);

     

       106
       106
       +
       -        runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name",

     

       107
       107
       +
       +        runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name",

     

       108
       108
       +
                                 device, NULL);

     

       109
       109
       +
                runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);

     

       110
       110
       +
                snprintf (msg, sizeof (msg), "Get volume group for device %s", device);

     

       111
       111
       +
       @@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno)

     

       112
       112
       +
        

     

       113
       113
       +
                runinit (&runner);

     

       114
       114
       +
        

     

       115
       115
       +
       -        runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv",

     

       116
       116
       +
       +        runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv",

     

       117
       117
       +
                                 device, NULL);

     

       118
       118
       +
                runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);

     

       119
       119
       +
                runner_log (&runner, this->name, GF_LOG_DEBUG, msg);

     

       120
       120
       +
       diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c

     

       121
       121
       +
       index 51db13df0..6fa7b92f9 100644

     

       122
       122
       +
       --- a/xlators/mgmt/glusterd/src/glusterd-utils.c

     

       123
       123
       +
       +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c

     

       124
       124
       +
       @@ -6027,7 +6027,6 @@ static struct fs_info {

     

       125
       125
       +
                char *fs_tool_pattern;

     

       126
       126
       +
                char *fs_tool_pkg;

     

       127
       127
       +
        } glusterd_fs[] = {

     

       128
       128
       +
       -        /* some linux have these in /usr/sbin/and others in /sbin/? */

     

       129
       129
       +
                { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },

     

       130
       130
       +
                { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },

     

       131
       131
       +
                { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },

     

       132
       132
       +
       @@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)

     

       133
       133
       +
                char           *trail             = NULL;

     

       134
       134
       +
                runner_t        runner            = {0, };

     

       135
       135
       +
                struct fs_info *fs                = NULL;

     

       136
       136
       +
       -        char            fs_tool_name[256] = {0, };

     

       137
       137
       +
                static dict_t  *cached_fs         = NULL;

     

       138
       138
       +
        

     

       139
       139
       +
                memset (key, 0, sizeof (key));

     

       140
       140
       +
       @@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)

     

       141
       141
       +
                                        cur_word = "N/A";

     

       142
       142
       +
                                        goto cached;

     

       143
       143
       +
                                }

     

       144
       144
       +
       -

     

       145
       145
       +
       -                        snprintf (fs_tool_name, sizeof (fs_tool_name),

     

       146
       146
       +
       -                                  "/usr/sbin/%s", fs->fs_tool_name);

     

       147
       147
       +
       -                        if (sys_access (fs_tool_name, R_OK|X_OK) == 0)

     

       148
       148
       +
       -                                runner_add_arg (&runner, fs_tool_name);

     

       149
       149
       +
       -                        else {

     

       150
       150
       +
       -                                snprintf (fs_tool_name, sizeof (fs_tool_name),

     

       151
       151
       +
       -                                          "/sbin/%s", fs->fs_tool_name);

     

       152
       152
       +
       -                                if (sys_access (fs_tool_name, R_OK|X_OK) == 0)

     

       153
       153
       +
       -                                        runner_add_arg (&runner, fs_tool_name);

     

       154
       154
       +
       -                        }

     

       155
       155
       +
       +                        runner_add_arg (&runner, fs->fs_tool_name);

     

       156
       156
       +
                                break;

     

       157
       157
       +
                        }

     

       158
       158
       +
                }

     

       159
       159
       +
       -- 

     

       160
       160
       +
       2.12.0

     

       161
       161
       +