From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eGBzNqvz+V6CfAAA0tVLHw (envelope-from ) for ; Mon, 29 Jun 2020 13:59:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YAQeMqvz+V5+dAAAbx9fmQ (envelope-from ) for ; Mon, 29 Jun 2020 13:59:07 +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 84B089404CE for ; Mon, 29 Jun 2020 13:59:07 +0000 (UTC) Received: from localhost ([::1]:48058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuJO-0007za-DN for larch@yhetil.org; Mon, 29 Jun 2020 09:59:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpuJK-0007yG-Pg for guix-patches@gnu.org; Mon, 29 Jun 2020 09:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpuJK-0002oJ-Gt for guix-patches@gnu.org; Mon, 29 Jun 2020 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpuJK-0004km-Fz for guix-patches@gnu.org; Mon, 29 Jun 2020 09:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. References: <20200629135559.12696-1-janneke@gnu.org> In-Reply-To: <20200629135559.12696-1-janneke@gnu.org> Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 13:59: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: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159343910718199 (code B ref 42122); Mon, 29 Jun 2020 13:59:02 +0000 Received: (at 42122) by debbugs.gnu.org; 29 Jun 2020 13:58:27 +0000 Received: from localhost ([127.0.0.1]:49005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIl-0004jS-3k for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIj-0004j3-0p for 42122@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59810) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuId-0002l7-NW; Mon, 29 Jun 2020 09:58:19 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=50092 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jpuIc-0000l9-ND; Mon, 29 Jun 2020 09:58:19 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:58:15 +0200 Message-Id: <20200629135817.12784-1-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: -0.01 X-TUID: bL6gSm+FfaaQ * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Return 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))) - (multiboot-modules (or (assq 'multiboot-modules rest) '())) + (multiboot-modules + (match (assq 'multiboot-modules rest) + ((_ args) args) + (#f '()))) (store-device ;; Linux device names like "/dev/sda1" are not suitable GRUB device -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com