diff options
| -rw-r--r-- | gnu/system.scm | 14 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 674c6f85be..fad5cf662c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -104,7 +104,7 @@ boot-parameters? boot-parameters-label boot-parameters-root-device - boot-parameters-boot-name + boot-parameters-bootloader-name boot-parameters-store-device boot-parameters-store-mount-point boot-parameters-kernel @@ -216,7 +216,7 @@ directly by the user." ;; exactly to the device field of the <file-system> object representing the ;; OS's root file system, so it might be a device path like "/dev/sda3". (root-device boot-parameters-root-device) - (boot-name boot-parameters-boot-name) + (bootloader-name boot-parameters-bootloader-name) (store-device boot-parameters-store-device) (store-mount-point boot-parameters-store-mount-point) (kernel boot-parameters-kernel) @@ -235,8 +235,8 @@ directly by the user." (label label) (root-device root) - (boot-name - (match (assq 'boot-name rest) + (bootloader-name + (match (assq 'bootloader-name rest) ((_ args) args) (#f 'grub))) ; for compatibility reasons. @@ -892,7 +892,7 @@ kernel arguments for that derivation to <boot-parameters>." (store -> (operating-system-store-file-system os)) (bootloader -> (bootloader-configuration-bootloader (operating-system-bootloader os))) - (boot-name -> (bootloader-name bootloader)) + (bootloader-name -> (bootloader-name bootloader)) (label -> (kernel->boot-label (operating-system-kernel os)))) (return (boot-parameters (label label) @@ -903,7 +903,7 @@ kernel arguments for that derivation to <boot-parameters>." (operating-system-kernel-arguments os system.drv root-device) (operating-system-user-kernel-arguments os))) (initrd initrd) - (boot-name boot-name) + (bootloader-name bootloader-name) (store-device (fs->boot-device store)) (store-mount-point (file-system-mount-point store)))))) @@ -929,7 +929,7 @@ being stored into the \"parameters\" file)." (kernel-arguments #$(boot-parameters-kernel-arguments params)) (initrd #$(boot-parameters-initrd params)) - (boot-name #$(boot-parameters-boot-name params)) + (bootloader-name #$(boot-parameters-bootloader-name params)) (store (device #$(boot-parameters-store-device params)) (mount-point #$(boot-parameters-store-mount-point params)))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index f71b1d71b8..35675cc018 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -425,7 +425,7 @@ generation as its default entry. STORE is an open connection to the store." "Return the bootloader name stored in SYSTEM's \"parameters\" file." (let ((params (unless-file-not-found (read-boot-parameters-file system)))) - (boot-parameters-boot-name params))) + (boot-parameters-bootloader-name params))) (define (reinstall-bootloader store number) "Re-install bootloader for existing system profile generation NUMBER. @@ -521,7 +521,7 @@ list of services." (let* ((generation (generation-file-name profile number)) (params (read-boot-parameters-file generation)) (label (boot-parameters-label params)) - (boot-name (boot-parameters-boot-name params)) + (bootloader-name (boot-parameters-bootloader-name params)) (root (boot-parameters-root-device params)) (root-device (if (bytevector? root) (uuid->string root) @@ -532,7 +532,7 @@ list of services." (format #t (G_ " canonical file name: ~a~%") (readlink* generation)) ;; TRANSLATORS: Please preserve the two-space indentation. (format #t (G_ " label: ~a~%") label) - (format #t (G_ " bootloader: ~a~%") boot-name) + (format #t (G_ " bootloader: ~a~%") bootloader-name) (format #t (G_ " root device: ~a~%") root-device) (format #t (G_ " kernel: ~a~%") kernel)))) |