From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ousNJI3h/l6vEQAA0tVLHw (envelope-from ) for ; Fri, 03 Jul 2020 07:43:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id QIaXH43h/l6VGwAA1q6Kng (envelope-from ) for ; Fri, 03 Jul 2020 07:43:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 77BAB94062D for ; Fri, 3 Jul 2020 07:43:08 +0000 (UTC) Received: from localhost ([::1]:51738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrGLi-00037n-4C for larch@yhetil.org; Fri, 03 Jul 2020 03:43:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrGLe-00036H-Kd for guix-patches@gnu.org; Fri, 03 Jul 2020 03:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrGLe-0002hM-Bk for guix-patches@gnu.org; Fri, 03 Jul 2020 03:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jrGLe-0003Cr-6E for guix-patches@gnu.org; Fri, 03 Jul 2020 03:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jul 2020 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159376213712245 (code B ref 42122); Fri, 03 Jul 2020 07:43:02 +0000 Received: (at 42122) by debbugs.gnu.org; 3 Jul 2020 07:42:17 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGKv-0003BQ-Ab for submit@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGKs-0003BD-7w for 42122@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49391) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrGKl-0002XB-Lh; Fri, 03 Jul 2020 03:42:07 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=36788 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jrGKj-0006Nt-Qw; Fri, 03 Jul 2020 03:42:06 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200629135559.12696-1-janneke@gnu.org> <20200629135817.12784-1-janneke@gnu.org> <87v9j5pp99.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 03 Jul 2020 09:42:03 +0200 In-Reply-To: <87v9j5pp99.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 02 Jul 2020 23:42:58 +0200") Message-ID: <878sg12gfo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: o5HjHCdbSR8z Ludovic Court=C3=A8s writes: Hi! > "Jan (janneke) Nieuwenhuizen" skribis: > >> * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Retu= rn > > s/unset/missing/, right? Yes; that's more clear and what I meant. >> only value for multiboot-modules instead of (key value). >> --- >> gnu/system.scm | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/gnu/system.scm b/gnu/system.scm >> index 44baacee7b..a6a9c958e6 100644 >> --- a/gnu/system.scm >> +++ b/gnu/system.scm >> @@ -351,9 +351,13 @@ file system labels." >> (('initrd ('string-append directory file)) ;the old format >> (string-append directory file)) >> (('initrd (? string? file)) >> - file))) >> + file) >> + (#f #f))) > > OK. =3D> to second patch. >> - (multiboot-modules (or (assq 'multiboot-modules rest) '())) >> + (multiboot-modules >> + (match (assq 'multiboot-modules rest) >> + ((_ args) args) >> + (#f '()))) > > Since this second hunk is a bug fix, I=E2=80=99d rather make it a separate > commit. Great, =3D> to first bugfix patch. > Otherwise LGTM! Janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com