diff options
| -rw-r--r-- | deployment/system.scm | 2 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 24 |
2 files changed, 7 insertions, 19 deletions
diff --git a/deployment/system.scm b/deployment/system.scm index 31aea93..8cb6c8d 100644 --- a/deployment/system.scm +++ b/deployment/system.scm @@ -99,7 +99,7 @@ (hosts-file #f) (mapped-devices (list)) (file-systems (cons* deployment:system:aisaka:file-system-boot-aisaka - deployment:system:aisaka:file-system-root + deployment:system:aisaka:file-system-root-aisaka 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 3619640..8934c16 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -21,6 +21,7 @@ (define-module (deployment system aisaka) #:export (bootloader-aisaka file-system-boot-aisaka + file-system-root-aisaka host-name-aisaka) #:use-module (guix gexp) #:use-module (sovereign bootloader) @@ -82,24 +83,6 @@ #:use-module ((users vmail) #:prefix users:vmail:)) -(define-public file-system-root - (gnu:system:file-systems:file-system - (device (gnu:system:file-systems:file-system-label "aisaka-root")) - (mount-point "/") - (type "ext4") - (flags (list)) - (options #f) - (mount? #t) - (mount-may-fail? #f) - (needed-for-boot? #t) - (check? #t) - (skip-check-if-clean? #f) - (repair 'preen) - (create-mount-point? #f) - (dependencies (list)) - (shepherd-requirements (list)) - (location (current-source-location)))) - (define gitolite-rc-file (gnu:services:version-control:gitolite-rc-file (umask #o0027))) @@ -315,4 +298,9 @@ (inherit file-system/efi) (device (file-system-label host-name-aisaka)))) +(define file-system-root-aisaka + (gnu:system:file-systems:file-system + (inherit file-system/root) + (device (file-system-label host-name-aisaka)))) + ;;; EOF |