From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Subject: bug#20067: [PATCH] system: grub: Introduce foreign-menu-entry. Date: Wed, 03 Aug 2016 18:52:32 +0200 Message-ID: <87lh0d23sf.fsf__23550.9447324604$1470243201$gmane$org@gnu.org> References: <20160803064249.7433-1-sleep_walker@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUzPl-0000DQ-5n for bug-guix@gnu.org; Wed, 03 Aug 2016 12:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUzPi-00074W-1Y for bug-guix@gnu.org; Wed, 03 Aug 2016 12:53:04 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUzPh-00074L-Ux for bug-guix@gnu.org; Wed, 03 Aug 2016 12:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bUzPh-0006j0-PI for bug-guix@gnu.org; Wed, 03 Aug 2016 12:53:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20160803064249.7433-1-sleep_walker@gnu.org> ("=?UTF-8?Q?Tom=C3=A1=C5=A1_?= =?UTF-8?Q?=C4=8Cech?="'s message of "Wed, 3 Aug 2016 08:42:49 +0200") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: =?UTF-8?Q?Tom=C3=A1=C5=A1_?= =?UTF-8?Q?=C4=8Cech?= Cc: guix-devel@gnu.org, 20067@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi! Tom=C3=A1=C5=A1 =C4=8Cech skribis: > * gnu/system/grub(foreign-menu-entry): New record type. > > menu-entry type is suitable for kernel and initrd from GuixSD as it is lo= oking > for menu-entry-linux/bzImage for kernel in every case which makes pasing = any > other form impossible. AIUI, this is a followup to , and it=E2=80=99s admittedly a shame that this isn=E2=80=99t fixed! I still think that the approach proposed at is more appropriate; =E2=80=98menu-entry=E2=80=99 would always work, no duplication= would be necessary. As a stop-gap measure, I would prefer to (1) allow: (menu-entry ;; =E2=80=A6 (linux #~(string-append #$kernel "/bzImage"))) (2) remove the =E2=80=9C/bzImage=E2=80=9D assumption and use the above idio= m everywhere in the current code, and (3) and have a hack along these lines to correctly interpret (string-append =E2=80=A6) in the =E2=80=98parameters=E2= =80=99 file: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/system.scm b/gnu/system.scm index d6bf6c4..467d907 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -766,7 +766,11 @@ this file is the reconstruction of GRUB menu entries for old configurations." (boot-parameters (label label) (root-device root) - (kernel linux) + (kernel (match linux + (('string-append (? string? strings) ...) + (string-concatenate strings)) + (_ + linux))) (kernel-arguments (match (assq 'kernel-arguments rest) ((_ args) args) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thoughts? Thanks, Ludo=E2=80=99. --=-=-=--