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 UDhyHitV/l5zQgAA0tVLHw (envelope-from ) for ; Thu, 02 Jul 2020 21:44:11 +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 0EJpGitV/l5NXAAA1q6Kng (envelope-from ) for ; Thu, 02 Jul 2020 21:44:11 +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 E5F4F94051E for ; Thu, 2 Jul 2020 21:44:10 +0000 (UTC) Received: from localhost ([::1]:54018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr705-0000FP-9t for larch@yhetil.org; Thu, 02 Jul 2020 17:44:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jr6zy-0000F0-ID for guix-patches@gnu.org; Thu, 02 Jul 2020 17:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44314) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jr6zy-0008Mq-9F for guix-patches@gnu.org; Thu, 02 Jul 2020 17:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jr6zy-0004ng-73 for guix-patches@gnu.org; Thu, 02 Jul 2020 17:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jul 2020 21:44: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: "Jan \(janneke\) Nieuwenhuizen" Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159372618618381 (code B ref 42122); Thu, 02 Jul 2020 21:44:02 +0000 Received: (at 42122) by debbugs.gnu.org; 2 Jul 2020 21:43:06 +0000 Received: from localhost ([127.0.0.1]:55860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr6z4-0004mP-CL for submit@debbugs.gnu.org; Thu, 02 Jul 2020 17:43:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr6z3-0004lv-74 for 42122@debbugs.gnu.org; Thu, 02 Jul 2020 17:43:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41809) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr6yx-00082a-Ul; Thu, 02 Jul 2020 17:42:59 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59852 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jr6yx-0003bk-F2; Thu, 02 Jul 2020 17:42:59 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200629135559.12696-1-janneke@gnu.org> <20200629135817.12784-1-janneke@gnu.org> Date: Thu, 02 Jul 2020 23:42:58 +0200 In-Reply-To: <20200629135817.12784-1-janneke@gnu.org> (Jan Nieuwenhuizen's message of "Mon, 29 Jun 2020 15:58:15 +0200") Message-ID: <87v9j5pp99.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: HQaxw8X8ADQY Hi! "Jan (janneke) Nieuwenhuizen" skribis: > * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Return s/unset/missing/, right? > 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. > - (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. Otherwise LGTM!