From cb090f9787bdb634943fbcffcfd451a6d010ce1a Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Tue, 10 Jan 2023 11:24:53 +0100 Subject: [PATCH] testing nested if for configless slurmd --- glicid/services/parallel.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/glicid/services/parallel.scm b/glicid/services/parallel.scm index a0d0ede..8b7815e 100644 --- a/glicid/services/parallel.scm +++ b/glicid/services/parallel.scm @@ -201,20 +201,24 @@ (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) (log-file log-file (default "/var/log/slurm/slurmd.log")) (slurmctld-host slurmctld-host (default #f)) + (configless configless (default #f)) (log-level log-level (default #f))) (define slurmd-service (match-lambda - (($ slurm slurmd-conf slurmctld-host log-file log-level) + (($ slurm slurmd-conf slurmctld-host configless log-file log-level) (list (shepherd-service (provision '(slurmd)) (documentation "Run slurmd.") (requirement '(user-processes)) (respawn? #t) (start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmd") "-D" - #$@(if slurmctld-host - (list (string-append "--conf-server" slurmctld-host)) - (list (string-append "-f" slurmd-conf))) + #$@(if configless + '() + (list + #$@(if slurmctld-host + (list (string-append "--conf-server" slurmctld-host)) + (list (string-append "-f" slurmd-conf))))) #$@(if log-level (list log-level) '()))