From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: How to use custom grub? Date: Mon, 07 Nov 2016 15:50:39 +0000 Message-ID: <87bmxr8f1s.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <8737j85yek.fsf@duckhunt.i-did-not-set--mail-host-address--so-tickle-me> <87a8df1ioy.fsf@gnu.org> <878tsy6r2k.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20161106004117.1d08b79b@scratchpost.org> <20161107114833.2c1453ca@scratchpost.org> <87inrz8qss.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20161107160544.76784851@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3mC8-0006jV-6o for guix-devel@gnu.org; Mon, 07 Nov 2016 10:50:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3mC3-0005Vd-CO for guix-devel@gnu.org; Mon, 07 Nov 2016 10:50:48 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c3mC2-0005VN-To for guix-devel@gnu.org; Mon, 07 Nov 2016 10:50:43 -0500 In-Reply-To: <20161107160544.76784851@scratchpost.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Danny Milosavljevic Cc: guix-devel@gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Danny Milosavljevic writes: > Hi Marius, > > On Mon, 07 Nov 2016 11:36:51 +0000 > Marius Bakke wrote: > >> That's it! This makes it pick up (bootloader (grub-configuration (grub >> grub-efi))) from my config.scm: >>=20 >> making '/gnu/store/kgk9rrawq9fxh1g2j6121gl3lcz47395-system' the current = system... >> Installing for x86_64-efi platform. >> Installation finished. No error reported. >>=20 >> Even though I'm now working on multi-platform grub, I think we should >> have this anyway so that the "grub" argument works as expected. WDYT? > > Yes, I agree that grub should not be magically picked up but rather be re= ad from the configuration - as you do here. This makes alternative bootload= ers possible and is also less surprising in any case. > > Also in guix/scripts/system.scm in perform-action there's a (setenv "PATH= " ...) form. I think that one should be replaced, too - for much the same r= easons. It would be better to just pass grub to install-grub* (which would = need its parameter list adapted) instead of mucking with PATH :P > > In this way the package variable would flow from the os configuration all= the way to the actual "grub-install" invocation call without magical envir= onment variables, packages that just happen to be pulled in from some impor= ted module etc. > > If you want, you can also fix this one up, too. (If not, I'll wait until = your stuff is merged and fix it myself - no worries) > > A first test whether it was enough is to remove the #:use-module (gnu pac= kages grub) from guix/scripts/system.scm and see whether it still works (it= should). For clarity I would make the final patch remove it, too. Hi Danny! You raise some very good points. The patch I just sent indeed works without #:use-module (gnu packages grub), so that should be included. Passing the grub object to grub-install seems like it is better suited for a separate patch. I have a couple of other things on my list before ready to hack on grub-install (need to pass "--efi-directory" somehow), but happy to review any work on it. Attached is the same patch without loading the grub module. Would be great to clear this out of the patch queue. Thanks a lot! :) --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJYIKLPAAoJEKKgbfKjOlT6uIkIAJ0vHAI+S3R2dcin7Wr57c1i rBA9aOfQ2mJniP7xHpgpuVrt7Je0QOXqmWg8Hkor8KV8G7M4UCWQOGa3uhuVOGlN VTggHfXSPs26/Z7/Es2e5KUI/hfME7Kpw2mgHXLjLOQzYcWsu4TOpy8eXz8wnqtj uMy9DUQXzteF7hSrU4zJIegOE2ojXiCVnohqVHbuIgFr8OwbE82OYObYlPdVwu/B BYTVe0QywD25jYIZslD6t7zI0DvJX1MFoUNTU4XjG81MsT48o+Kyt+IZvYBnjLh+ pYUqgWC40Ry+Fn553sgi7JP3qAinemGtHExBaB1HaX4r3i5Zv8RS4MdsDQ7JOSQ= =YyHn -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-system-Use-grub-from-bootloader-configuration.patch >From 5e31312aeae87d63ab2c64e92835231b59c804db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 7 Nov 2016 11:56:52 +0000 Subject: [PATCH] system: Use grub from bootloader configuration. * gnu/system/grub.scm (gnu): Export grub-configuration-grub. * guix/scripts/system.scm (perform-action): Use it. (define-module): Don't import (gnu packages grub). Co-authored-by: Danny Milosavljevic --- gnu/system/grub.scm | 1 + guix/scripts/system.scm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index 5c9d0f1..4657b06 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -51,6 +51,7 @@ grub-configuration grub-configuration? grub-configuration-device + grub-configuration-grub menu-entry menu-entry? diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index df9b37d..71ddccf 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -44,7 +44,6 @@ #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services herd) - #:use-module (gnu packages grub) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) @@ -617,7 +616,8 @@ building anything." #:image-size image-size #:full-boot? full-boot? #:mappings mappings)) - (grub (package->derivation grub)) + (grub (package->derivation (grub-configuration-grub + (operating-system-bootloader os)))) (grub.cfg (if (eq? 'container action) (return #f) (operating-system-grub.cfg os -- 2.10.2 --=-=-=--