From f7c2859152ffbd1ee37735d7f22ecfb3e9d44a09 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Mon, 5 Aug 2024 16:33:46 +0100
Subject: Specify containerd-service-type manually, as is now required

It is required by docker-service-type, but not activated automatically
anymore, presumably to force manual configuration.
---
 tw/system.scm     | 2 ++
 tw/system/lud.scm | 1 +
 tw/system/vin.scm | 1 +
 3 files changed, 4 insertions(+)

diff --git a/tw/system.scm b/tw/system.scm
index 67dea549..e4aee963 100644
--- a/tw/system.scm
+++ b/tw/system.scm
@@ -230,6 +230,8 @@ ACTION!=\"remove\", SUBSYSTEM==\"leds\", GROUP=\"video\", MODE=\"0664\"
 
    (service docker-service-type)
 
+   (service containerd-service-type)  ; required by `docker-service-type'
+
    (service krb5-service-type
      (krb5-configuration
       (default-realm "CERN.CH")
diff --git a/tw/system/lud.scm b/tw/system/lud.scm
index 2e0ea190..8504cf97 100644
--- a/tw/system/lud.scm
+++ b/tw/system/lud.scm
@@ -79,6 +79,7 @@
 
             (service dbus-root-service-type)  ; for Docker
             (service elogind-service-type)    ; for Docker
+            (service containerd-service-type) ; for Docker
             (service docker-service-type)     ; for Paperless
             (service redis-service-type)      ; for Paperless
             (service paperless-service-type
diff --git a/tw/system/vin.scm b/tw/system/vin.scm
index b7c30b18..e7f4bb4b 100644
--- a/tw/system/vin.scm
+++ b/tw/system/vin.scm
@@ -181,6 +181,7 @@
          (bind-address (server-wireguard-address host-name))
          (metrics-credentials-file "/etc/grafana/metrics-credentials")))
       (service docker-service-type)     ; required by `grafana-service-type'
+      (service containerd-service-type) ; required by `docker-service-type'
       (service dbus-root-service-type)  ; required by `docker-service-type'
       (service elogind-service-type)    ; required by `docker-service-type'
       (simple-service 'grafana-restic-backup restic-backup-service-type
-- 
cgit v1.2.3