commit 039b2476cedebcaee88a36a7821b701d1c0c0447
parent fed5ce67f4e9dab2250aa322096a183bd186762f
Author: vin <git@vineetk.net>
Date: Sun, 10 May 2026 22:21:04 +0200
Revert "saklas: switch to linux-libre from linux"
This reverts commit b2acd88c88c68dfbba448f477f6bdbb545fa9be1.
Diffstat:
5 files changed, 45 insertions(+), 40 deletions(-)
diff --git 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))
diff --git a/epistemia/systems/demiurge.scm b/epistemia/systems/demiurge.scm
@@ -129,7 +129,7 @@
'("zfs"))
(simple-service 'zfs-shepherd-services
shepherd-root-service-type
- zfs-linux-shepherd-services)
+ zfs-shepherd-services)
(simple-service 'zfs-shepherd-services-user-processes
user-processes-service-type
'(zfs-automount))
diff --git a/epistemia/systems/hastur.scm b/epistemia/systems/hastur.scm
@@ -120,7 +120,7 @@
'("zfs"))
(simple-service 'zfs-shepherd-services
shepherd-root-service-type
- zfs-linux-shepherd-services)
+ zfs-shepherd-services)
(simple-service 'zfs-shepherd-services-user-processes
user-processes-service-type
'(zfs-automount))
diff --git a/epistemia/systems/linux-initrd.scm b/epistemia/systems/linux-initrd.scm
@@ -106,15 +106,15 @@ MODULES."
(define* (zfs-raw-initrd file-systems
#:key
- (linux-package linux-libre)
+ (linux linux-libre)
(zfs-package zfs)
(linux-modules '())
(pre-mount #t)
(mapped-devices '())
(keyboard-layout #f)
(helper-packages '())
- (qemu-networking? #f)
- (volatile-root? #f)
+ qemu-networking?
+ volatile-root?
(on-error 'debug)
(monkey-patch? #t)
#:allow-other-keys)
@@ -150,7 +150,7 @@ MODULES."
#t))
(define kodir
- (flat-linux-module-directory* linux-package
+ (flat-linux-module-directory* linux
(list (gexp-input zfs-package "module"))
linux-modules))
@@ -228,23 +228,25 @@ MODULES."
(define* (epistemia-zfs-initrd file-systems
#:key
- (linux-package linux-libre)
+ (linux linux-libre)
(zfs-package zfs)
+ (linux-modules '())
+ (mapped-devices '())
+ (keyboard-layout #f)
+ qemu-networking?
+ volatile-root?
+ (extra-modules '())
+ (on-error 'debug)
(monkey-patch? #t)
- (linux-modules '())
- (extra-modules '())
- (qemu-networking? #f)
- (volatile-root? #f)
- (keyboard-layout #f)
- #:allow-other-keys
- #:rest rest)
- "Build INITRD, extended to import root-on-zfs pool."
+ #:allow-other-keys)
+
(define linux-modules*
(cons "zfs"
`(,@linux-modules
,@(file-system-modules file-systems)
,@(if volatile-root? '("overlay") '())
,@extra-modules)))
+
(define helper-packages
(cons zfs-package
(append (file-system-packages file-systems
@@ -252,9 +254,15 @@ MODULES."
(if keyboard-layout
(list loadkeys-static)
'()))))
- (apply zfs-raw-initrd
- file-systems
- `(#:linux-package ,linux-package
- #:zfs-package ,zfs-package
- #:monkey-patch? ,monkey-patch?
- ,@rest)))
+
+ (zfs-raw-initrd file-systems
+ #:linux linux
+ #:zfs-package zfs-package
+ #:linux-modules linux-modules*
+ #:mapped-devices mapped-devices
+ #:helper-packages helper-packages
+ #:keyboard-layout keyboard-layout
+ #:qemu-networking? qemu-networking?
+ #:volatile-root? volatile-root?
+ #:on-error on-error
+ #:monkey-patch? monkey-patch?))
diff --git a/epistemia/systems/saklas.scm b/epistemia/systems/saklas.scm
@@ -2,7 +2,6 @@
#:use-module (gnu)
#:use-module (gnu packages bash)
#:use-module (gnu packages emacs)
- #:use-module (gnu packages file-systems)
#:use-module (gnu packages golang-crypto)
#:use-module (gnu packages linux)
#:use-module (gnu packages mail)
@@ -27,12 +26,15 @@
#:use-module (guix gexp)
#:use-module (guix transformations)
#:use-module (guix utils)
+ #:use-module (nongnu packages linux)
+ #:use-module (nongnu system linux-initrd)
#:use-module (epistemia bootloader)
#:use-module (epistemia systems base-system)
#:use-module (epistemia systems linux-initrd)
#:use-module (epistemia services age-secret)
#:use-module (epistemia services zfs)
#:use-module (epistemia packages bittorrent)
+ #:use-module (epistemia packages zfs)
#:use-module (ice-9 format))
(define %nginx-badboi
@@ -226,15 +228,16 @@ table inet filter {
(name "vmail"))
%base-groups))
- (kernel linux-libre)
+ (kernel linux-6.18)
(kernel-arguments (list "net.ifnames=0"))
- (kernel-loadable-modules (list (list zfs "module")))
+ (kernel-loadable-modules (list (list zfs-linux "module")))
(initrd (lambda (file-systems . args)
- (apply epistemia-zfs-initrd file-systems
- #:linux-package linux-libre
- #:zfs-package zfs
- args)))
+ (apply microcode-initrd file-systems
+ #:initrd epistemia-zfs-initrd
+ #:zfs-package zfs-linux
+ args)))
+ (firmware (cons* amdgpu-firmware %base-firmware))
(bootloader (bootloader-configuration
(bootloader grub-zfs)
@@ -274,7 +277,7 @@ table inet filter {
(packages (append (list emacs-no-x
git
rsync
- zfs)
+ zfs-linux)
%base-packages))
(services (modify-services (append (list (service age-secret-service-type
