summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-04-16 22:27:13 +0200
committerLudovic Courtès <ludo@gnu.org>2022-04-18 23:26:23 +0200
commit6b677f4299f38ea70e1852388086ee95c2c48622 (patch)
tree6ec8e303f673ef98dab10079d8d8ae87327900c2
parentf2239f3b956886aa0842c711523893945c2fe955 (diff)
downloadguix-6b677f4299f38ea70e1852388086ee95c2c48622.tar.gz
services: ipfs: Adjust for Shepherd 0.9.
This is a followup to e1f0c88ea221d846b5a533c4dc88e99e953af63e.

* gnu/services/networking.scm (%ipfs-activation)[shepherd&co]: New
variable.
[container-gexp]: Use it.
-rw-r--r--gnu/services/networking.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 5bb8638930..b302be5aaf 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -2074,12 +2074,19 @@ See yggdrasil -genconf for config options.")
         #$@(map (cute apply set-config!-gexp <>) settings)))
   (define inner-script
     (program-file "ipfs-activation-inner" inner-gexp))
+
+  (define shepherd&co
+    ;; 'make-forkexec-constructor/container' needs version 0.9 for
+    ;; #:supplementary-groups.
+    (cons shepherd-0.9
+          (list (lookup-package-input shepherd-0.9 "guile-fibers"))))
+
   ;; Run ipfs init and ipfs config from a container,
   ;; in case the IPFS daemon was compromised at some point
   ;; and ~/.ipfs is now a symlink to somewhere outside
   ;; %ipfs-home.
   (define container-gexp
-    (with-extensions (list shepherd)
+    (with-extensions shepherd&co
       (with-imported-modules (source-module-closure
                               '((gnu build shepherd)
                                 (gnu system file-systems)))