From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
Subject: bug#19220: GRUB fails to find the
	=?UTF-8?Q?=E2=80=98bzImage=E2=80=99?= file when
	=?UTF-8?Q?=E2=80=98/boot=E2=80=99?= is on a separate partition
Date: Sun, 30 Nov 2014 23:04:28 +0100
Message-ID: <873890mjkj.fsf@gnu.org>
References: <87oarppwz1.fsf@karetnikov.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34227)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1XvCcC-0005RG-Pt
	for bug-guix@gnu.org; Sun, 30 Nov 2014 17:05:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1XvCc3-0004co-B5
	for bug-guix@gnu.org; Sun, 30 Nov 2014 17:05:10 -0500
Received: from debbugs.gnu.org ([140.186.70.43]:52986)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1XvCc3-0004cO-37
	for bug-guix@gnu.org; Sun, 30 Nov 2014 17:05:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1XvCc2-0007tN-KD
	for bug-guix@gnu.org; Sun, 30 Nov 2014 17:05:02 -0500
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.19220.B19220.141738507230294@debbugs.gnu.org>
In-Reply-To: <87oarppwz1.fsf@karetnikov.org> (Nikita Karetnikov's message of
	"Sun, 30 Nov 2014 00:34:26 +0400")
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
To: Nikita Karetnikov <nikita@karetnikov.org>
Cc: 19220@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

Could you please try the attached patch:


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 00e09f9..5d0f4f1 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -209,11 +209,12 @@ entries corresponding to old generations of the system."
     (match-lambda
      (($ <menu-entry> label linux arguments initrd)
       #~(format port "menuentry ~s {
+  search --file --set ~a/bzImage~%
   linux ~a/bzImage ~a
   initrd ~a
 }~%"
                 #$label
-                #$linux (string-join (list #$@arguments))
+                #$linux #$linux (string-join (list #$@arguments))
                 #$initrd))))
 
   (mlet %store-monad ((sugar (eye-candy config #~port)))
@@ -223,14 +224,9 @@ entries corresponding to old generations of the system."
             #$sugar
             (format port "
 set default=~a
-set timeout=~a
-search.file ~a/bzImage~%"
+set timeout=~a~%"
                     #$(grub-configuration-default-entry config)
-                    #$(grub-configuration-timeout config)
-                    #$(any (match-lambda
-                            (($ <menu-entry> _ linux)
-                             linux))
-                           all-entries))
+                    #$(grub-configuration-timeout config))
             #$@(map entry->gexp all-entries)
 
             #$@(if (pair? old-entries)

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable


>From the system, run:

  ./pre-inst-env guix system reconfigure config.scm

and then reboot.

I believe this fixes the problem.

Thanks,
Ludo=E2=80=99.

--=-=-=--