~ruther/guix-local

c448bf7443dcfbc44f525526a43ac52754a0cd87 — Mark H Weaver 10 years ago 08dcff4
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'.
1 files changed, 9 insertions(+), 3 deletions(-)

M gnu/system/grub.scm
M gnu/system/grub.scm => gnu/system/grub.scm +9 -3
@@ 206,6 206,11 @@ fi~%"
  "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 @@ entries corresponding to old generations of the system."
     (($ <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)))