nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootloader: Rename boot-name to bootloader-name. 

* gnu/system (<boot-parameters>)[boot-name]: Rename field to...
[bootloader-name]: ... this.  Adjust users.
* gnu/scripts/system.scm: Adjust accordingly.
This commit is contained in:
Mathieu Othacehe 2017-06-10 10:47:25 +02:00
parent 9a0968816f
commit f96752e378
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/system.scm
View File

@ -104,7 +104,7 @@
boot-parameters? boot-parameters?
boot-parameters-label boot-parameters-label
boot-parameters-root-device boot-parameters-root-device
boot-parameters-boot-name boot-parameters-bootloader-name
boot-parameters-store-device boot-parameters-store-device
boot-parameters-store-mount-point boot-parameters-store-mount-point
boot-parameters-kernel boot-parameters-kernel
@ -216,7 +216,7 @@ directly by the user."
;; exactly to the device field of the <file-system> object representing the ;; 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". ;; OS's root file system, so it might be a device path like "/dev/sda3".
(root-device boot-parameters-root-device) (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-device boot-parameters-store-device)
(store-mount-point boot-parameters-store-mount-point) (store-mount-point boot-parameters-store-mount-point)
(kernel boot-parameters-kernel) (kernel boot-parameters-kernel)
@ -235,8 +235,8 @@ directly by the user."
(label label) (label label)
(root-device root) (root-device root)
(boot-name (bootloader-name
(match (assq 'boot-name rest) (match (assq 'bootloader-name rest)
((_ args) args) ((_ args) args)
(#f 'grub))) ; for compatibility reasons. (#f 'grub))) ; for compatibility reasons.
@ -892,7 +892,7 @@ kernel arguments for that derivation to <boot-parameters>."
(store -> (operating-system-store-file-system os)) (store -> (operating-system-store-file-system os))
(bootloader -> (bootloader-configuration-bootloader (bootloader -> (bootloader-configuration-bootloader
(operating-system-bootloader os))) (operating-system-bootloader os)))
(boot-name -> (bootloader-name bootloader)) (bootloader-name -> (bootloader-name bootloader))
(label -> (kernel->boot-label (operating-system-kernel os)))) (label -> (kernel->boot-label (operating-system-kernel os))))
(return (boot-parameters (return (boot-parameters
(label label) (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-kernel-arguments os system.drv root-device)
(operating-system-user-kernel-arguments os))) (operating-system-user-kernel-arguments os)))
(initrd initrd) (initrd initrd)
(boot-name boot-name) (bootloader-name bootloader-name)
(store-device (fs->boot-device store)) (store-device (fs->boot-device store))
(store-mount-point (file-system-mount-point store)))))) (store-mount-point (file-system-mount-point store))))))
@ -929,7 +929,7 @@ being stored into the \"parameters\" file)."
(kernel-arguments (kernel-arguments
#$(boot-parameters-kernel-arguments params)) #$(boot-parameters-kernel-arguments params))
(initrd #$(boot-parameters-initrd params)) (initrd #$(boot-parameters-initrd params))
(boot-name #$(boot-parameters-boot-name params)) (bootloader-name #$(boot-parameters-bootloader-name params))
(store (store
(device #$(boot-parameters-store-device params)) (device #$(boot-parameters-store-device params))
(mount-point #$(boot-parameters-store-mount-point params)))) (mount-point #$(boot-parameters-store-mount-point params))))

6
guix/scripts/system.scm
View File

@ -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." "Return the bootloader name stored in SYSTEM's \"parameters\" file."
(let ((params (unless-file-not-found (let ((params (unless-file-not-found
(read-boot-parameters-file system)))) (read-boot-parameters-file system))))
(boot-parameters-boot-name params))) (boot-parameters-bootloader-name params)))
(define (reinstall-bootloader store number) (define (reinstall-bootloader store number)
"Re-install bootloader for existing system profile generation NUMBER. "Re-install bootloader for existing system profile generation NUMBER.
@ -521,7 +521,7 @@ list of services."
(let* ((generation (generation-file-name profile number)) (let* ((generation (generation-file-name profile number))
(params (read-boot-parameters-file generation)) (params (read-boot-parameters-file generation))
(label (boot-parameters-label params)) (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 (boot-parameters-root-device params))
(root-device (if (bytevector? root) (root-device (if (bytevector? root)
(uuid->string root) (uuid->string root)
@ -532,7 +532,7 @@ list of services."
(format #t (G_ " canonical file name: ~a~%") (readlink* generation)) (format #t (G_ " canonical file name: ~a~%") (readlink* generation))
;; TRANSLATORS: Please preserve the two-space indentation. ;; TRANSLATORS: Please preserve the two-space indentation.
(format #t (G_ " label: ~a~%") label) (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_ " root device: ~a~%") root-device)
(format #t (G_ " kernel: ~a~%") kernel)))) (format #t (G_ " kernel: ~a~%") kernel))))