mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
system: grub: On MIPS, the linux image name is vmlinuz, not bzImage.
* gnu/system/grub.scm (grub-configuration-file): Add 'linux-image-name' internal procedure. Use it from 'entry->gexp'.
This commit is contained in:
parent
08dcff4744
commit
c448bf7443
1 changed files with 9 additions and 3 deletions
|
@ -206,6 +206,11 @@ (define* (grub-configuration-file config entries
|
|||
"Return the GRUB configuration file corresponding to CONFIG, a
|
||||
<grub-configuration> object. OLD-ENTRIES is taken to be a list of menu
|
||||
entries corresponding to old generations of the system."
|
||||
(define linux-image-name
|
||||
(if (string-prefix? "mips" system)
|
||||
"vmlinuz"
|
||||
"bzImage"))
|
||||
|
||||
(define all-entries
|
||||
(append entries (grub-configuration-menu-entries config)))
|
||||
|
||||
|
@ -214,13 +219,14 @@ (define entry->gexp
|
|||
(($ <menu-entry> label linux arguments initrd)
|
||||
#~(format port "menuentry ~s {
|
||||
# Set 'root' to the partition that contains the kernel.
|
||||
search --file --set ~a/bzImage~%
|
||||
search --file --set ~a/~a~%
|
||||
|
||||
linux ~a/bzImage ~a
|
||||
linux ~a/~a ~a
|
||||
initrd ~a
|
||||
}~%"
|
||||
#$label
|
||||
#$linux #$linux (string-join (list #$@arguments))
|
||||
#$linux #$linux-image-name
|
||||
#$linux #$linux-image-name (string-join (list #$@arguments))
|
||||
#$initrd))))
|
||||
|
||||
(mlet %store-monad ((sugar (eye-candy config #~port)))
|
||||
|
|
Loading…
Reference in a new issue