01/15: system: grub: On MIPS, the linux image name is vmlinuz, not bzImage.

[Mark H. Weaver]

mhw pushed a commit to branch mhw-core-updates
in repository guix.

commit 24e48bf9e367c3d01ef8f591a0dadc8526217d63
Author: Mark H Weaver <address@hidden>
Date:   Wed Aug 19 16:30:02 2015 -0400

    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'.
---
 gnu/system/grub.scm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index e49b6db..7f85adf 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -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 address@hidden))
+                #$linux #$linux-image-name
+                #$linux #$linux-image-name (string-join (list address@hidden))
                 #$initrd))))
 
   (mlet %store-monad ((sugar (eye-candy config #~port)))