suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

slurm: bugifx, add su/echo paths

Browse Source 
slurmd requires su and echo to work with "--get-user-env". If slurmd
does not find /bin/su or /bin/echo, it crashes.
This commit is contained in:
Markus Kowalewski 2020-06-10 10:55:05 +02:00
parent af4491f26c
commit 5d8f61f3bf
No known key found for this signature in database
GPG Key ID: D865C8A91D7025EB
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/computing/slurm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl, zlib , python, munge, perl, pam, openssl, zlib, shadow, coreutils
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg, lz4, rdma-core , readline, freeipmi, libssh2, xorg, lz4, rdma-core
# enable internal X11 support via libssh2 # enable internal X11 support via libssh2
@ -22,10 +22,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
prePatch = stdenv.lib.optional enableX11 '' prePatch = ''
substituteInPlace src/common/env.c \
--replace "/bin/echo" "${coreutils}/bin/echo"
'' + (stdenv.lib.optionalString enableX11 ''
substituteInPlace src/common/x11_util.c \ substituteInPlace src/common/x11_util.c \
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
''; '');
# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
# https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl python munge perl pam openssl zlib curl python munge perl pam openssl zlib
libmysqlclient ncurses gtk2 lz4 rdma-core libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi lua hwloc numactl readline freeipmi shadow.su
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
configureFlags = with stdenv.lib; configureFlags = with stdenv.lib;