>From ab369ae1b894bcbb4045aa70b30399543eb4b050 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Thu, 1 Dec 2016 20:41:08 +0100
Subject: [PATCH 2/2] services: cuirass: Put specifications in the store.
* gnu/services/cuirass.scm (): Change type of
'specifications' field to an alist to match the documentation example.
(cuirass-shepherd-service): Store the provided specifications in a file. Use
that file as the "--specification" argument.
---
gnu/services/cuirass.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index d843c07..4975a7e 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -52,8 +52,8 @@
(default 60))
(database cuirass-configuration-database ;string (file-name)
(default "/var/run/cuirass/cuirass.db"))
- (specifications cuirass-configuration-specifications ;string (file-name)
- (default ""))
+ (specifications cuirass-configuration-specifications ;specification-alist
+ (default '()))
(use-substitutes? cuirass-configuration-use-substitutes? ;boolean
(default #f))
(one-shot? cuirass-configuration-one-shot? ;boolean
@@ -66,7 +66,7 @@
(let ((cache-directory (cuirass-configuration-cache-directory config))
(interval (cuirass-configuration-interval config))
(database (cuirass-configuration-database config))
- (specifications (cuirass-configuration-specifications config))
+ (specs (cuirass-configuration-specifications config))
(use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config)))
(list (shepherd-service
@@ -78,9 +78,11 @@
#$@(if (string=? "" cache-directory)
'()
(list "--cache-directory" cache-directory))
- #$@(if (string=? "" specifications)
+ #$@(if (null? specs)
'()
- (list "--specifications" specifications))
+ (let ((str (format #f "'~S" specs)))
+ (list "--specifications"
+ (plain-file "specs.scm" str))))
"--database" #$database
"--interval" #$(number->string interval)
#$@(if use-substitutes? '("--use-substitutes") '())
--
2.10.2