Compare commits

..

No commits in common. "e899a34d8ede41fd0face974634392b2afec8c48" and "0754d51fbab5d1489850e841fe934226c09e9232" have entirely different histories.

2 changed files with 8 additions and 27 deletions

View File

@ -81,7 +81,6 @@
%rosenthal-skeletons %rosenthal-skeletons
%rosenthal-skeletons-installer %rosenthal-skeletons-installer
%rosenthal-desktop-services/base
%rosenthal-desktop-services/gdm %rosenthal-desktop-services/gdm
%rosenthal-desktop-services/tuigreet %rosenthal-desktop-services/tuigreet

View File

@ -107,34 +107,16 @@
;;; ;;;
(define-configuration/no-serialization zfs-configuration (define-configuration/no-serialization zfs-configuration
(zfs
(file-like zfs)
"ZFS package to use.")
(kernel-has-zfs-module?
(boolean #f)
"Whether or not ZFS modules have already been built into the kernel.")
(volumes? (volumes?
(boolean #f) (boolean #f)
"Wait for ZFS volumes.") "")
(auto-mount? (auto-mount?
(boolean #t) (boolean #t)
"Mount all available ZFS file systems.")) ""))
(define zfs-linux-loadable-module-service (define zfs-shepherd
(match-record-lambda <zfs-configuration> (match-record-lambda <zfs-configuration>
(zfs kernel-has-zfs-module?) (volumes? auto-mount?)
(if kernel-has-zfs-module?
'()
(list `(,zfs "module")))))
(define add-zfs-package
(match-record-lambda <zfs-configuration>
(zfs)
(list zfs)))
(define zfs-shepherd-service
(match-record-lambda <zfs-configuration>
(zfs volumes? auto-mount?)
(append (append
(list (list
(shepherd-service (shepherd-service
@ -186,16 +168,16 @@
(name 'zfs) (name 'zfs)
(extensions (extensions
(list (service-extension linux-loadable-module-service-type (list (service-extension linux-loadable-module-service-type
zfs-linux-loadable-module-service) (const (list `(,zfs "module"))))
(service-extension udev-service-type (service-extension udev-service-type
add-zfs-package) (const (list zfs)))
(service-extension kernel-module-loader-service-type (service-extension kernel-module-loader-service-type
(const '("zfs"))) (const '("zfs")))
(service-extension shepherd-root-service-type (service-extension shepherd-root-service-type
zfs-shepherd-service) zfs-shepherd)
(service-extension user-processes-service-type (service-extension user-processes-service-type
(const '(file-system-zfs))) (const '(file-system-zfs)))
(service-extension profile-service-type (service-extension profile-service-type
add-zfs-package))) (const (list zfs)))))
(default-value (zfs-configuration)) (default-value (zfs-configuration))
(description ""))) (description "")))