From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id iOmCFZdN2WVoCgEAe85BDQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 02:59:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iOmCFZdN2WVoCgEAe85BDQ (envelope-from ) for ; Sat, 24 Feb 2024 02:59:51 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=WwH2RRED; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708739991; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LnUSPTQktpAvc8EzNuj0aWRgK01l8JF0tpXJ3ZUexhI=; b=hZtdiymQuWn/Ll3vfMmjUbHNfhf44yulheCk6eEQP0yuBzIcdzj0/2eL7rTB9u+ArbuHql pRJIr7G2JX0ILRoaRdrfgCUpKkqvxc6Iw9uUl+rMD1k9uqiVWbZjl2bUlJAGodwM1U5Amk 3K2qNXyjwSrF7O392D+nVz5yJGeF9wQtToFYQ9QVzHam2k1k29Mt0zvTAkY5f1HoicpTQp Pfwmd2h55KesIjTWvNBuCs8c4KNhs6Kss7cklqpgc+3A7ZSbiS3h+jva8mZa747gCWt/xR lusKfoT6LSRE/tDxOi9EYa8YxFnLOJISU0n39NI0hAYdLNWVCBE/I/O3XbFi5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=WwH2RRED; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708739991; a=rsa-sha256; cv=none; b=EyLqjWYzX665DYgK/EsAPT0sZnZGZRciuYPbUydDCLL2B3vEdW3PYp7B8v3CCtJ46GAz/x Pul5+7vlvFN351fvuqeLH+YFcd/dHFL4pBw9NhhnAogzJBxZd5FjKpYLicIVi8fZMBvgfh QlrW+avr8IRpMFoi2T8NGlWuxEMKmgdzuRqAF7GgGYmsGMI2DxSJUO3GDszvWWLPjG/kAK nvy1tvEr82LkaECjGi0QY46nd/GfIb2Nqc9XYxpvD/x2y8gNsYXmtIw9Vgx5Tu8xFMcx/v iY1+QssVxgrVD8n2NKI62qzN6XBZSVzKNO42FwGY6fTjz6AARADDQtWZDi+3Zg== 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 358E415E28 for ; Sat, 24 Feb 2024 02:59:51 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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 From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.27 X-Spam-Score: -6.27 X-Migadu-Queue-Id: 358E415E28 X-Migadu-Scanner: mx13.migadu.com X-TUID: 8WY2IK9s7Z2Z 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 -- 2.41.0