diff options
Diffstat (limited to 'deployment/system')
| -rw-r--r-- | deployment/system/aisaka.scm | 2 | ||||
| -rw-r--r-- | deployment/system/asakura.scm | 9 | ||||
| -rw-r--r-- | deployment/system/cokolwiek.scm | 4 | ||||
| -rw-r--r-- | deployment/system/mcdowell.scm | 4 | ||||
| -rw-r--r-- | deployment/system/rakan.scm | 4 |
5 files changed, 8 insertions, 15 deletions
diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index 78b35ea..49d28a3 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -114,7 +114,7 @@ (define-public file-system-efi (gnu:system:file-systems:file-system - (device (gnu:system:file-systems:file-system-label "AISAKA")) + (device (gnu:system:file-systems:file-system-label "BOOT")) (mount-point "/boot") (type "vfat") (flags (list)) diff --git a/deployment/system/asakura.scm b/deployment/system/asakura.scm index 3a253ec..7ad954a 100644 --- a/deployment/system/asakura.scm +++ b/deployment/system/asakura.scm @@ -92,13 +92,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define (bootloader) - (use-modules (gnu bootloader grub)) - ((@ (gnu bootloader) bootloader-configuration) - (bootloader grub-efi-bootloader) - (targets (list "/boot")) - (keyboard-layout keyboard-layout))) - (define (file-systems) (append gnu:system:file-systems:%base-file-systems (list root-partition @@ -129,7 +122,7 @@ (define-public system (gnu:system:operating-system (kernel nongnu:packages:linux:linux) - (bootloader (bootloader)) + (bootloader sovereign:devices:amd64:custom-bootloader-configuration) (label (sovereign:systems:operating-system-label* host-name gnu:system:this-operating-system)) (keyboard-layout keyboard-layout) diff --git a/deployment/system/cokolwiek.scm b/deployment/system/cokolwiek.scm index f5015c5..fcc3980 100644 --- a/deployment/system/cokolwiek.scm +++ b/deployment/system/cokolwiek.scm @@ -60,7 +60,7 @@ (define file-system-efi (let* ( (l-system-name (string-upcase system-name)) - (l-device (sovereign:devices:file-system-label l-system-name))) + (l-device (sovereign:devices:file-system-label "BOOT"))) (gnu:system:file-systems:file-system (inherit sovereign:devices:file-system/efi) (device l-device)))) @@ -86,7 +86,7 @@ ( (l-guix-homes (list users:id1000:named-home-environment users:id1001:named-home-environment)) (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes)) - (l-bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name)) + (l-bootloader sovereign:devices:amd64:custom-bootloader-configuration) (l-file-systems (cons* file-system-root file-system-efi gnu:system:file-systems:%base-file-systems)) diff --git a/deployment/system/mcdowell.scm b/deployment/system/mcdowell.scm index 3627ec1..e5519bc 100644 --- a/deployment/system/mcdowell.scm +++ b/deployment/system/mcdowell.scm @@ -61,7 +61,7 @@ (define file-system-efi (let* ( (l-system-name (string-upcase system-name)) - (l-device (sovereign:devices:file-system-label l-system-name))) + (l-device (sovereign:devices:file-system-label "BOOT"))) (gnu:system:file-systems:file-system (inherit sovereign:devices:file-system/efi) (device l-device)))) @@ -100,7 +100,7 @@ (let* ( (l-guix-homes (list users:id1000:named-home-environment)) (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes)) - (l-bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name)) + (l-bootloader sovereign:devices:amd64:custom-bootloader-configuration) (l-file-systems (cons* file-system-root file-system-efi gnu:system:file-systems:%base-file-systems)) diff --git a/deployment/system/rakan.scm b/deployment/system/rakan.scm index 0fb9f00..1daec21 100644 --- a/deployment/system/rakan.scm +++ b/deployment/system/rakan.scm @@ -79,7 +79,7 @@ (define file-system-efi (let* ( (l-system-name (string-upcase system-name)) - (l-device (sovereign:devices:file-system-label l-system-name))) + (l-device (sovereign:devices:file-system-label "BOOT"))) (gnu:system:file-systems:file-system (inherit sovereign:devices:file-system/efi) (device l-device)))) @@ -232,7 +232,7 @@ (kernel-loadable-modules (list)) (kernel-arguments gnu:system:%default-kernel-arguments) (hurd #f) - (bootloader (sovereign:devices:amd64:custom-bootloader-configuration system-name)) + (bootloader sovereign:devices:amd64:custom-bootloader-configuration) (label (sovereign:systems:operating-system-label* system-name gnu:system:this-operating-system)) (keyboard-layout sovereign:devices:pl-keyboard-layout) |