saklas: switch to linux-libre from linux

2 files changed, 11 insertions, 23 deletions

diff --git a/epistemia/bootloader.scm b/epistemia/bootloader.scm
index 413b0d7..dd14fdf 100644
--- a/epistemia/bootloader.scm
+++ b/epistemia/bootloader.scm
@@ -21,21 +21,3 @@
               "set root=(hd0,gpt2)")
              ((" /store/") 
               " /gnu/@/store/")))))))
-
-;; TODO combine into previous with an argument?
-(define-public grub-zfs-bios
-  (bootloader
-    (inherit grub-bootloader)
-    (name 'grub-zfs)
-    (installer
-     #~(lambda (bootloader targets mount-point)
-         (use-modules (guix build utils))
-         (let ((standard-installer #$(bootloader-installer grub-bootloader)))
-           (standard-installer bootloader targets mount-point))
-         (let ((grub-cfg (string-append mount-point "/boot/grub/grub.cfg")))
-           (chmod grub-cfg #o644)
-           (substitute* grub-cfg
-             (("search --label --set [^ ]+")
-              "set root=(hd0,gpt2)")
-             ((" /store/")
-              " /gnu/@/store/")))))))
diff --git a/epistemia/services/zfs.scm b/epistemia/services/zfs.scm
index 8cbc441..16f5d37 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 (guix gexp)
+  #:use-module (gnu packages file-systems)
   #:use-module (epistemia packages zfs)
-  #:export (zfs-shepherd-services))
+  #:use-module (guix gexp))
 
 ;; from raid5atemyhomework's valiant efforts
-(define zfs-shepherd-services
-  (let ((zpool (file-append zfs-linux "/sbin/zpool"))
-        (zfs (file-append zfs-linux "/sbin/zfs"))
+(define* (make-zfs-shepherd-services zfs-package)
+  (let ((zpool (file-append zfs-package "/sbin/zpool"))
+        (zfs (file-append zfs-package "/sbin/zfs"))
         (scheme-modules `((srfi srfi-1)
                           (srfi srfi-34)
                           (srfi srfi-35)
@@ -38,3 +38,9 @@
                   (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))