From patchwork Sat Feb 24 01:51:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 60946 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 DBFBE27BBE2; Sat, 24 Feb 2024 02:00:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 59EFB27BBE9 for ; Sat, 24 Feb 2024 01:59:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKG-0004Q5-Ic; Fri, 23 Feb 2024 20:59:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdhKF-0004Pu-BF for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:39 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdhKF-0006ky-0f for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKc-0003dl-Hl for guix-patches@gnu.org; Fri, 23 Feb 2024 21:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 03/12] Also move boot-parameters->menu-entry. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 02:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69343@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.170873995213756 (code B ref 69343); Sat, 24 Feb 2024 02:00:02 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:12 +0000 Received: from localhost ([127.0.0.1]:36535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJn-0003Zb-CD for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:12 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:41018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJh-0003Ye-9W for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=LEpLdcDW5XI6JcB iqCxX5+ctUaqlDUajJQiqlHANPlU=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=WwH2RREDzgYR4uM4IDRKwaPbseqOsbFM5cI9exZU UE+SqntpV0vNEXyGi3fazv7mauhKSfvjhye07V1fnRbfTl5HVRT3ezCUacHBvIqUmR0osq eU8eqQqnpbJ/vjHImNGgUibZa/+rG2JUTgWHAeV9ja91+XpWvApyVqQYiVobg= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id e1233e51 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:55 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cae211ed; Sat, 24 Feb 2024 01:51:55 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:36 -0800 Message-ID: <55f27c88ae2a7d9e6d9b73a306c267e5a312ad2a.1708736440.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Change-Id: I794198e074b6d3012526a3056599ee3db1f1cdba --- gnu/system.scm | 28 ---------------------------- gnu/system/boot.scm | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index a438137731..e748066e16 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -150,8 +150,6 @@ (define-module (gnu system) hurd-default-essential-services - boot-parameters->menu-entry - local-host-aliases ;deprecated %root-account %setuid-programs @@ -304,32 +302,6 @@ (define* (operating-system-kernel-arguments (append (bootable-kernel-arguments os root-device version) (operating-system-user-kernel-arguments os))) - -;;; -;;; Boot parameters -;;; - -(define (boot-parameters->menu-entry conf) - "Return a instance given CONF, a instance." - (let* ((kernel (boot-parameters-kernel conf)) - (multiboot-modules (boot-parameters-multiboot-modules conf)) - (multiboot? (pair? multiboot-modules))) - (menu-entry - (label (boot-parameters-label conf)) - (device (boot-parameters-store-device conf)) - (device-mount-point (boot-parameters-store-mount-point conf)) - (linux (and (not multiboot?) kernel)) - (linux-arguments (if (not multiboot?) - (boot-parameters-kernel-arguments conf) - '())) - (initrd (boot-parameters-initrd conf)) - (multiboot-kernel (and multiboot? kernel)) - (multiboot-arguments (if multiboot? - (boot-parameters-kernel-arguments conf) - '())) - (multiboot-modules (if multiboot? - (boot-parameters-multiboot-modules conf) - '()))))) ;;; diff --git a/gnu/system/boot.scm b/gnu/system/boot.scm index 87b0184f98..d3f58e1ade 100644 --- a/gnu/system/boot.scm +++ b/gnu/system/boot.scm @@ -64,6 +64,8 @@ (define-module (gnu system boot) read-boot-parameters read-boot-parameters-file + boot-parameters->menu-entry + ensure-not-/dev)) ;;; @@ -274,4 +276,26 @@ (define (ensure-not-/dev device) #f device)) +(define (boot-parameters->menu-entry conf) + "Return a instance given CONF, a instance." + (let* ((kernel (boot-parameters-kernel conf)) + (multiboot-modules (boot-parameters-multiboot-modules conf)) + (multiboot? (pair? multiboot-modules))) + (menu-entry + (label (boot-parameters-label conf)) + (device (boot-parameters-store-device conf)) + (device-mount-point (boot-parameters-store-mount-point conf)) + (linux (and (not multiboot?) kernel)) + (linux-arguments (if (not multiboot?) + (boot-parameters-kernel-arguments conf) + '())) + (initrd (boot-parameters-initrd conf)) + (multiboot-kernel (and multiboot? kernel)) + (multiboot-arguments (if multiboot? + (boot-parameters-kernel-arguments conf) + '())) + (multiboot-modules (if multiboot? + (boot-parameters-multiboot-modules conf) + '()))))) + ;;; boot.scm ends here