Merge pull request #115839 from markuskowa/fix-slurm
nixos/slurm: expose to path config files
This commit is contained in:
commit
2af233afac
|
@ -274,6 +274,15 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
etcSlurm = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
internal = true;
|
||||||
|
default = etcSlurm;
|
||||||
|
description = ''
|
||||||
|
Path to directory with slurm config files. This option is set by default from the
|
||||||
|
Slurm module and is meant to make the Slurm config file available to other modules.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -308,7 +317,7 @@ in
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
if [ -z "$SLURM_CONF" ]
|
if [ -z "$SLURM_CONF" ]
|
||||||
then
|
then
|
||||||
SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
|
SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
|
||||||
else
|
else
|
||||||
"$EXE" "\$0"
|
"$EXE" "\$0"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue