From 23707511dce1f96ac8b68a926b83785841905c6a Mon Sep 17 00:00:00 2001 From: vin Date: Sun, 10 May 2026 22:21:04 +0200 Subject: Revert "saklas: switch to linux-libre from linux" This reverts commit b2acd88c88c68dfbba448f477f6bdbb545fa9be1. --- epistemia/services/zfs.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/epistemia/services/zfs.scm b/epistemia/services/zfs.scm index 16f5d37..8cbc441 100644 --- a/epistemia/services/zfs.scm +++ b/epistemia/services/zfs.scm @@ -1,13 +1,13 @@ (define-module (epistemia services zfs) #:use-module (gnu services shepherd) - #:use-module (gnu packages file-systems) + #:use-module (guix gexp) #:use-module (epistemia packages zfs) - #:use-module (guix gexp)) + #:export (zfs-shepherd-services)) ;; from raid5atemyhomework's valiant efforts -(define* (make-zfs-shepherd-services zfs-package) - (let ((zpool (file-append zfs-package "/sbin/zpool")) - (zfs (file-append zfs-package "/sbin/zfs")) +(define zfs-shepherd-services + (let ((zpool (file-append zfs-linux "/sbin/zpool")) + (zfs (file-append zfs-linux "/sbin/zfs")) (scheme-modules `((srfi srfi-1) (srfi srfi-34) (srfi srfi-35) @@ -38,9 +38,3 @@ (invoke/quiet #$zfs "unmount" "-a" "-f") #f)))) (list zfs-scan zfs-automount))) - -(define-public zfs-shepherd-services - (make-zfs-shepherd-services zfs)) - -(define-public zfs-linux-shepherd-services - (make-zfs-shepherd-services zfs-linux)) -- cgit v1.2.3