From patchwork Mon Jun 29 13:58:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 22962 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C99E427BBE4; Mon, 29 Jun 2020 14:59:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9821F27BBE1 for ; Mon, 29 Jun 2020 14:59:11 +0100 (BST) Received: from localhost ([::1]:48164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuJT-00082Z-3G for patchwork@mira.cbaines.net; Mon, 29 Jun 2020 09:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpuJL-0007z8-IG for guix-patches@gnu.org; Mon, 29 Jun 2020 09:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpuJL-0002oR-9H for guix-patches@gnu.org; Mon, 29 Jun 2020 09:59:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpuJL-0004l3-8v for guix-patches@gnu.org; Mon, 29 Jun 2020 09:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 3/3] guix system: "describe" displays multiboot info. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 13:59:03 +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.159343911018219 (code B ref 42122); Mon, 29 Jun 2020 13:59:03 +0000 Received: (at 42122) by debbugs.gnu.org; 29 Jun 2020 13:58:30 +0000 Received: from localhost ([127.0.0.1]:49010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIn-0004jn-Rc for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIl-0004jA-UA for 42122@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59812) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuIg-0002lO-BU; Mon, 29 Jun 2020 09:58:22 -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 1jpuIf-0000l9-B9; Mon, 29 Jun 2020 09:58:21 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:58:17 +0200 Message-Id: <20200629135817.12784-3-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200629135817.12784-1-janneke@gnu.org> References: <20200629135817.12784-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/system.scm (display-system-generation): Display multiboot-modules commands if set. --- guix/scripts/system.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index d9cf45da23..7f062452ac 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -480,6 +480,7 @@ list of services." (uuid->string root) root)) (kernel (boot-parameters-kernel params)) + (multiboot-modules (boot-parameters-multiboot-modules params)) (provenance (catch 'system-error (lambda () (call-with-input-file @@ -509,6 +510,10 @@ list of services." (format #t (G_ " kernel: ~a~%") kernel) + (when (pair? multiboot-modules) + (format #t (G_ " multiboot: ~a~%") + (string-join (map car multiboot-modules) "\n "))) + (match provenance (#f #t) (('provenance ('version 0)