diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/system.scm | 4 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 25 |
2 files changed, 9 insertions, 20 deletions
diff --git a/deployment/system.scm b/deployment/system.scm index 88c05f1..31aea93 100644 --- a/deployment/system.scm +++ b/deployment/system.scm @@ -98,8 +98,8 @@ (host-name deployment:system:aisaka:host-name-aisaka) (hosts-file #f) (mapped-devices (list)) - (file-systems (cons* deployment:system:aisaka:file-system-root - deployment:system:aisaka:file-system-efi + (file-systems (cons* deployment:system:aisaka:file-system-boot-aisaka + deployment:system:aisaka:file-system-root gnu:system:file-systems:%base-file-systems)) (swap-devices (list)) (users (cons* users:id1000:uid1000-account 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 |