From patchwork Fri Nov 16 09:36:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 220 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 DA0C716817; Fri, 16 Nov 2018 09:38:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 81E59167E9 for ; Fri, 16 Nov 2018 09:38:28 +0000 (GMT) Received: from localhost ([::1]:43622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNaa3-0007m7-Jy for patchwork@mira.cbaines.net; Fri, 16 Nov 2018 04:38:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNaZh-0007Eg-ML for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNaZg-0003BV-C3 for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gNaZe-00039W-BA for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gNaZe-000168-73 for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33405] [PATCH 04/10] system: De-monadify 'operating-system-boot-parameters'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Nov 2018 09:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33405 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33405@debbugs.gnu.org Received: via spool by 33405-submit@debbugs.gnu.org id=B33405.15423610264086 (code B ref 33405); Fri, 16 Nov 2018 09:38:02 +0000 Received: (at 33405) by debbugs.gnu.org; 16 Nov 2018 09:37:06 +0000 Received: from localhost ([127.0.0.1]:54749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gNaYj-00013P-8s for submit@debbugs.gnu.org; Fri, 16 Nov 2018 04:37:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gNaYe-00012C-BZ for 33405@debbugs.gnu.org; Fri, 16 Nov 2018 04:37:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNaYY-0002i8-1z for 33405@debbugs.gnu.org; Fri, 16 Nov 2018 04:36:54 -0500 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNaYS-0002dw-8g; Fri, 16 Nov 2018 04:36:49 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59268 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gNaYS-0004C1-17; Fri, 16 Nov 2018 04:36:48 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 16 Nov 2018 10:36:18 +0100 Message-Id: <20181116093624.4820-4-ludo@gnu.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181116093624.4820-1-ludo@gnu.org> References: <20181116093624.4820-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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 * gnu/system.scm (operating-system-boot-parameters): Turn to direct style instead of monadic. (operating-system-bootcfg): Adjust accordingly. (operating-system-boot-parameters-file): Likewise. --- gnu/system.scm | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 4ea9391c4a..d4ce0d8e24 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -938,9 +938,9 @@ listed in OS. The C library expects to find it under (mlet* %store-monad ((root-fs -> (operating-system-root-file-system os)) (root-device -> (file-system-device root-fs)) - (params (operating-system-boot-parameters os root-device - #:system-kernel-arguments? - #t)) + (params -> (operating-system-boot-parameters os root-device + #:system-kernel-arguments? + #t)) (entry -> (boot-parameters->menu-entry params)) (bootloader-conf -> (operating-system-bootloader os))) (define generate-config-file @@ -956,25 +956,24 @@ listed in OS. The C library expects to find it under "Return a monadic record that describes the boot parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' and '--load' to ." - (mlet* %store-monad - ((initrd -> (operating-system-initrd-file os)) - (store -> (operating-system-store-file-system os)) - (bootloader -> (bootloader-configuration-bootloader - (operating-system-bootloader os))) - (bootloader-name -> (bootloader-name bootloader)) - (label -> (kernel->boot-label (operating-system-kernel os)))) - (return (boot-parameters - (label label) - (root-device root-device) - (kernel (operating-system-kernel-file os)) - (kernel-arguments - (if system-kernel-arguments? - (operating-system-kernel-arguments os root-device) - (operating-system-user-kernel-arguments os))) - (initrd initrd) - (bootloader-name bootloader-name) - (store-device (ensure-not-/dev (file-system-device store))) - (store-mount-point (file-system-mount-point store)))))) + (let* ((initrd (operating-system-initrd-file os)) + (store (operating-system-store-file-system os)) + (bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os))) + (bootloader-name (bootloader-name bootloader)) + (label (kernel->boot-label (operating-system-kernel os)))) + (boot-parameters + (label label) + (root-device root-device) + (kernel (operating-system-kernel-file os)) + (kernel-arguments + (if system-kernel-arguments? + (operating-system-kernel-arguments os root-device) + (operating-system-user-kernel-arguments os))) + (initrd initrd) + (bootloader-name bootloader-name) + (store-device (ensure-not-/dev (file-system-device store))) + (store-mount-point (file-system-mount-point store))))) (define (device->sexp device) "Serialize DEVICE as an sexp (really, as an object with a read syntax.)" @@ -996,12 +995,12 @@ and '--load' to the returned file (since the returned file is then usually stored into the content-addressed \"system\" directory, it's usually not a good idea to give it because the content hash would change by the content hash being stored into the \"parameters\" file)." - (mlet* %store-monad ((root -> (operating-system-root-file-system os)) - (device -> (file-system-device root)) - (params (operating-system-boot-parameters - os device - #:system-kernel-arguments? - system-kernel-arguments?))) + (let* ((root (operating-system-root-file-system os)) + (device (file-system-device root)) + (params (operating-system-boot-parameters + os device + #:system-kernel-arguments? + system-kernel-arguments?))) (gexp->file "parameters" #~(boot-parameters (version 0)