From 1c3aed0cdb212a47a2d7619ac3aec103344f4f13 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Mon, 20 Oct 2025 13:36:41 +0800
Subject: [PATCH] services: zfs: Add zfs-configuration.

* modules/rosenthal/services/file-systems.scm (<zfs-configuration>): New data
type.
Enable auto mounting and disable volumes by default.
(zfs-shepherd-service): Rename to zfs-shepherd.
No longer use one-shot services.
(zfs-service-type): Adjust accordingly.
Set default value.

* modules/rosenthal/utils/transformations.scm (rosenthal-transformation-zfs):
Allow configuration.
---
 modules/rosenthal/services/file-systems.scm | 93 +++++++++++++--------
 modules/rosenthal/utils/transformations.scm |  4 +-
 2 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/modules/rosenthal/services/file-systems.scm b/modules/rosenthal/services/file-systems.scm
index 3f008aa..36d0067 100644
--- a/modules/rosenthal/services/file-systems.scm
+++ b/modules/rosenthal/services/file-systems.scm
@@ -4,6 +4,7 @@
 
 (define-module (rosenthal services file-systems)
   #:use-module (guix gexp)
+  #:use-module (guix records)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages file-systems)
   #:use-module (rosenthal packages admin)
@@ -19,7 +20,8 @@
 
             dumb-runtime-dir-service-type
 
-            zfs-service-type))
+            zfs-service-type
+            zfs-configuration))
 
 
 ;;;
@@ -101,37 +103,62 @@
 ;;; ZFS
 ;;;
 
+(define-configuration/no-serialization zfs-configuration
+  (volumes?
+   (boolean #f)
+   "")
+  (auto-mount?
+   (boolean #t)
+   ""))
 
-(define zfs-shepherd-service
-  (list (shepherd-service
-          (provision '(zfs-import))
-          (requirement '(kernel-module-loader))
-          (start
-           #~(make-forkexec-constructor
-              (list #$(file-append zfs "/sbin/zpool") "import" "-a" "-N")))
-          (one-shot? #t))
-        (shepherd-service
-          (provision '(zfs-volumes))
-          (requirement '(zfs-import))
-          (start
-           #~(make-forkexec-constructor
-              (list #$(file-append zfs "/bin/zvol_wait"))))
-          (one-shot? #t))
-        (shepherd-service
-          (provision '(zfs-mount))
-          (requirement '(zfs-import))
-          (start
-           #~(make-forkexec-constructor
-              (list #$(file-append zfs "/sbin/zfs") "mount" "-a" "-l")))
-          (one-shot? #t))
-        (shepherd-service
-          (provision '(file-system-zfs))
-          (requirement '(zfs-mount))
-          (start #~(const #t))
-          (stop
-           #~(make-system-destructor
-              (string-join
-               (list #$(file-append zfs "/sbin/zfs") "unmount" "-a")))))))
+(define zfs-shepherd
+  (match-record-lambda <zfs-configuration>
+      (volumes? auto-mount?)
+    (append
+     (list
+      (shepherd-service
+        (provision '(file-system-zfs))
+        (requirement
+         `(zfs-import
+           ,@(if volumes? '(zfs-volumes) '())
+           ,@(if auto-mount? '(zfs-mount) '())))
+        (start #~(const #t))
+        (stop #~(const #f)))
+      (shepherd-service
+        (provision '(zfs-import))
+        (requirement '(kernel-module-loader))
+        (start
+         #~(make-system-constructor
+            (string-join
+             (list #$(file-append zfs "/sbin/zpool") "import" "-a" "-N"))))
+        (stop #~(const #f))))
+     (if volumes?
+         (list
+          (shepherd-service
+            (provision '(zfs-volumes))
+            (requirement '(zfs-import))
+            (start
+             #~(make-system-constructor
+                (string-join
+                 ;; TODO: Patch references within zfs package instead.
+                 (list "PATH=/run/current-system/profile/bin:/run/current-system/profile/sbin"
+                       #$(file-append zfs "/bin/zvol_wait")))))
+            (stop #~(const #f))))
+         '())
+     (if auto-mount?
+         (list
+          (shepherd-service
+            (provision '(zfs-mount))
+            (requirement '(zfs-import))
+            (start
+             #~(make-system-constructor
+                (string-join
+                 (list #$(file-append zfs "/sbin/zfs") "mount" "-a" "-l"))))
+            (stop
+             #~(make-system-destructor
+                (string-join
+                 (list #$(file-append zfs "/sbin/zfs") "unmount" "-a"))))))
+         '()))))
 
 (define zfs-service-type
   (service-type
@@ -144,10 +171,10 @@
            (service-extension kernel-module-loader-service-type
                               (const '("zfs")))
            (service-extension shepherd-root-service-type
-                              (const zfs-shepherd-service))
+                              zfs-shepherd)
            (service-extension user-processes-service-type
                               (const '(file-system-zfs)))
            (service-extension profile-service-type
                               (const (list zfs)))))
-    (default-value #f)
+    (default-value (zfs-configuration))
     (description "")))
diff --git a/modules/rosenthal/utils/transformations.scm b/modules/rosenthal/utils/transformations.scm
index d07811d..fe11714 100644
--- a/modules/rosenthal/utils/transformations.scm
+++ b/modules/rosenthal/utils/transformations.scm
@@ -67,7 +67,7 @@
                                   (guix-configuration-guix config)))))))))))
 
 ;; NOTE: Booting from ZFS requires patching Guix.
-(define* (rosenthal-transformation-zfs #:key boot?)
+(define* (rosenthal-transformation-zfs #:key boot? (config (zfs-configuration)))
   (lambda (os)
     (operating-system
       (inherit os)
@@ -81,5 +81,5 @@
                '())
          ,@(operating-system-kernel-loadable-modules os)))
       (services
-       (cons* (service zfs-service-type)
+       (cons* (service zfs-service-type config)
               (operating-system-user-services os))))))