From patchwork Tue May 23 15:47:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50263 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 95D8227BBEA; Tue, 23 May 2023 16:49:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 E885527BBE2 for ; Tue, 23 May 2023 16:49:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1UFH-0007Py-A2; Tue, 23 May 2023 11:48:19 -0400 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 1q1UF9-0007BG-86 for guix-patches@gnu.org; Tue, 23 May 2023 11:48:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1UF7-0006HQ-Kh for guix-patches@gnu.org; Tue, 23 May 2023 11:48:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1UF7-0007uH-H9 for guix-patches@gnu.org; Tue, 23 May 2023 11:48:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 10/11] bootloader: grub: Use rumpdisk-style root when booting with "noide". Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168485688830377 (code B ref 63527); Tue, 23 May 2023 15:48:09 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:48:08 +0000 Received: from localhost ([127.0.0.1]:40248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UF5-0007tf-Ip for submit@debbugs.gnu.org; Tue, 23 May 2023 11:48:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEm-0007oi-OR for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1UEh-00065L-HS; Tue, 23 May 2023 11:47:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=1MHgAdw4ZEmYRf3DI5KP4AcSLeUwLHAPgKAr/9F/lGw=; b=gOmbFSxt5sK4A1phRMVz Pa8Cof9D4ZHkdr7MdkhG1mAc0uRznWpg5ZUNbMUdQ82psa3mNrFUiMWkh4gLT2tXrTA53jF6IRTg4 yue6ySjMlWXnGaUCEAdUZrN3TYRDnjbo4hd1ZyCgZF8t5uETheJQjBie53c3f4XsWG74T5maDzC/d 4FSTVZ6/Bt2Pf6o9X3+doMpSc+DV8l3PxM38C4z2VzbhLpxlgJy5lKXAP9ff+oq41qmN2AY4LW92a kX+ELhvPBw0tE+NWIS3pLL+eJMpvk+ZyjtesijQP+VQ83B1ecnVwsrhK7fM/xScjqZEGKhnp3ihwB 72sjQc9zI2Kkeg==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1q1UEh-0002jp-52; Tue, 23 May 2023 11:47:43 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:31 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 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: , 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 * gnu/bootloader/grub.scm (make-grub-configuration): When "noide" is in arguments, use device name "wd0" rather than "hd0". --- gnu/bootloader/grub.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index ecd44e7f3c..af46d76380 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2020 Mathieu Othacehe -;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Stefan @@ -404,17 +404,20 @@ (define* (make-grub-configuration grub config entries #$linux (string-join (list #$@arguments)) #$initrd))) (multiboot-kernel - (let ((kernel (menu-entry-multiboot-kernel entry)) - (arguments (menu-entry-multiboot-arguments entry)) - (modules (menu-entry-multiboot-modules entry)) - (root-index 1)) ; XXX EFI will need root-index 2 + (let* ((kernel (menu-entry-multiboot-kernel entry)) + (arguments (menu-entry-multiboot-arguments entry)) + (disk (if (member "noide" arguments) "w" "h")) + (modules (menu-entry-multiboot-modules entry)) + (root-index 1)) ; XXX EFI will need root-index 2 #~(format port " menuentry ~s { - multiboot ~a root=device:hd0s~a~a~a + multiboot ~a root=part:~a:device:~ad0~a~a }~%" #$label #$kernel - #$root-index (string-join (list #$@arguments) " " 'prefix) + #$root-index + #$disk + (string-join (list #$@arguments) " " 'prefix) (string-join (map string-join '#$modules) "\n module " 'prefix)))) (chain-loader