[PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Mark H Weaver <mhw@netris.org>]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

Currently, we assume that the linux image name is "bzImage", but this
varies depending on platform.  On MIPS, the name is "vmlinuz".  This
modifies our 'grub-configuation-file' generation code to use "vmlinuz"
on MIPS.

      Mark


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz --]
[-- Type: text/x-patch, Size: 1682 bytes --]

From a15b9a1eedd5b110b94e13f0fea17323aa1e160e Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 19 Aug 2015 16:30:02 -0400
Subject: [PATCH] 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 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index fe7400a..1378f5f 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -221,6 +221,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)))
 
@@ -229,13 +234,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)))
-- 
2.5.0