From 49cf5777411f2abaf04a9bffc5c9ed3ed608713f Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 26 May 2026 12:05:42 +0200 Subject: (system aisaka): rename and redefine file-system-efi --- deployment/system/aisaka.scm | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'deployment/system/aisaka.scm') diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index dcc7655..3619640 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -20,9 +20,11 @@ (define-module (deployment system aisaka) #:export (bootloader-aisaka + file-system-boot-aisaka host-name-aisaka) #:use-module (guix gexp) #:use-module (sovereign bootloader) + #:use-module (sovereign system file-systems) #:use-module ((deployment gexp) #:prefix deployment:gexp:) #:use-module ((gnu bootloader) @@ -80,24 +82,6 @@ #:use-module ((users vmail) #:prefix users:vmail:)) -(define-public file-system-efi - (gnu:system:file-systems:file-system - (device (gnu:system:file-systems:file-system-label "BOOT")) - (mount-point "/boot") - (type "vfat") - (flags (list)) - (options #f) - (mount? #t) - (mount-may-fail? #t) - (needed-for-boot? #f) - (check? #t) - (skip-check-if-clean? #f) - (repair 'preen) - (create-mount-point? #f) - (dependencies (list)) - (shepherd-requirements (list)) - (location (current-source-location)))) - (define-public file-system-root (gnu:system:file-systems:file-system (device (gnu:system:file-systems:file-system-label "aisaka-root")) @@ -326,4 +310,9 @@ (define bootloader-aisaka (custom-bootloader-configuration bootloader-configuration-targets-aisaka)) +(define file-system-boot-aisaka + (gnu:system:file-systems:file-system + (inherit file-system/efi) + (device (file-system-label host-name-aisaka)))) + ;;; EOF -- cgit v1.3