From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uG0BC/zlr2YGXgAAe85BDQ:P1 (envelope-from ) for ; Sun, 04 Aug 2024 20:35:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id uG0BC/zlr2YGXgAAe85BDQ (envelope-from ) for ; Sun, 04 Aug 2024 22:35:08 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=i0EleJdC; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=AmnRLXoS; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=Oxv2AIv2; 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=1722803708; 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-type:content-type: 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=T7CrnYrZUPErLjr1dyo1VcrbKFppbiWQ623b6fS5A3A=; b=PDMkDWR2tw2DZGCQHbg4QE/3P3k/r/8REJ5zpj+/iWA8/FJjXCo75nmArbqXgwiOlB02/2 alJlFAxOotVvO0dmLvMvnfJrszyr2s4IDgB/jqr6xXsnBbcPPxp4twQS6CjBO5ePXFjfEd uDwSsjSVULt7ZJk4QFOD9oEvjgMTgRoKGw10iqlFOMjyyHaeKCV6vJXI6qKMpscEsDXZmz 3Cf+4oUIHqoiwMpJN915c801KgfoZ8gnZQ1XcY3HEXSWj9fqiS6zXwpr1mbfcglHKhAB35 oe0bpLhsEsDm6hwbcAJIfyWjpDJE4FGEsyGSOxOJncUZxCfb6iaruICiG2JtEQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722803708; a=rsa-sha256; cv=none; b=ZSAVCCmPQJf9HiJeRG+1Z/7+qbNRmpJDVJxTOQz+fe8TJcBSyQq2d2mA8ZY7y/G2dULk2B XlcEZxFgttCbAhVYM2hDXyOJTYdRstE3hP46R4DvONRWWKlWofg/aiIxGSFOG0i/gxqMqi Ci5kiDQi1ZtdIJJ2uKoPLtXodNidhra7hoq6X1nXTeN1fweqvSkLU0P8Ndte+Bwq5pqbr1 fd2XAfqxCU1E1dzQOl8Z/HazbUKM7CxTgUbiIqXqvYjnztXPEtmwhRnDu1nB+uuysDepFn MzSiz06xzFbqXyoQRoxRFp+UuG+Du+rQ/3cyMcWcCcPnVs5wDDtlmF2kh8Widw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=i0EleJdC; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=AmnRLXoS; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=Oxv2AIv2; 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" 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 C6ABE7B8BB for ; Sun, 04 Aug 2024 22:35:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sahwI-0002LB-PL; Sun, 04 Aug 2024 16:34:50 -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 1sahwF-0002IW-AF for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34:47 -0400 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 1sahwF-0008LO-1J for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=T7CrnYrZUPErLjr1dyo1VcrbKFppbiWQ623b6fS5A3A=; b=i0EleJdC0sKpzJAVTm6/WQt0ihRx3liLHMgWBeR505Stn1PvbKuMwCPGtYjjWF1xXLEHUSLh1UmrZhrx9+HqdMXLjjq/AtbVuST9S9RBjFjx8nF0gDy0YVK/ky0jmqtTIJB2x4QCQp5nd7MFXjYAtjIyM1NnrS2kTWgh/KuNKxik4m40hnLvLCk82ifhQOlz34F2lBi/LE95gfHbwZ2XBkd5gSkcGSuJk3VS0PuQJHpjSeCjq9kCPA+B3MQZBMUrWmBqgzrTCN1vijp53L/jVS2vk67Jken93N+6YbUZkDOJx49PdounMn6KkJRoHWDAytmleSHqVPn/9Eg9923mAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sahwa-0006Ps-DS; Sun, 04 Aug 2024 16:35:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v3 14/15] gnu: tests: Update tests to new targets system. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 20:35:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72457 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72457@debbugs.gnu.org Cc: Lilah Tascheter , Sergey Trofimov , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172280367624409 (code B ref 72457); Sun, 04 Aug 2024 20:35:08 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 20:34:36 +0000 Received: from localhost ([127.0.0.1]:57386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahw2-0006LW-Vh for submit@debbugs.gnu.org; Sun, 04 Aug 2024 16:34:35 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:56798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahvz-0006KE-Tt for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 16:34:33 -0400 DKIM-Signature: a=rsa-sha256; b=AmnRLXoSoB2yi7mkHYJNTU6uLM1QZUODqEYKUiYCVTZsiauNCUTwH2VuFYieByUircyEEs4b1iDqbivR/orkoLULQvJImsDFkPLmXL2SwSWHrVj9rdXqGPEAxI67S0v+/Fnk/JF8OOu7O6RThfFa5X4maqrWau2huiT/ylcuWA0c84hQe0/OoGXNhbWkmJr+krpACzlNC7roR6asXgLQWXX1ar1aZYyPT2/Q0BecRYd2BdfUu6IwQ9PjuA9OmtP2ILa8aWteXQMso0d/i5xzfp+2DyqKreLxWwyQzgefz4CCS8vbT4S/1EnOdqXTAd5hVbxkla8A2zpI0x3tvSRb7w==; s=purelymail2; d=lunabee.space; v=1; bh=c3Xw7WvqzR5t+XNjmuLAZfgJcTYAGf+FSk0jfE/3dxU=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=Oxv2AIv2d4mAsn53LTkRC5Yh/VJKnErBMdfBzlZMJ+GFx7YFzYKaLLFuyFcXD/bCqA2vVmRfJFlsNLg+s22DgSs3hcOpOKxS0C4BL8QEACiTxhln87NEFTUUquGsbjwpuw/f3Yl1/rCNZl1+iEJPYQ6IaqQ8Rp0tGkXXRnfxEFvyBjnlnYQODHQV+fi4bHDcNGtxP1/Q3FnwYTslbTZd2CYd+84sPzDRg4ozAfrvDJT8fcxeKxz525qgGgfrOS2YdNaSrMMjK4FFsQ9Gp+ErSXmdWdcNJQ9R6aqTmBPOnjLYpvbTI7qkAERwuJMA6xzEr2fzIiDkIUOuJGVT/T6j9Q==; s=purelymail2; d=purelymail.com; v=1; bh=c3Xw7WvqzR5t+XNjmuLAZfgJcTYAGf+FSk0jfE/3dxU=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 72457@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1317130453; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 20:33:45 +0000 (UTC) Date: Sun, 4 Aug 2024 15:32:00 -0500 Message-ID: <218462fbf87a6a3e7cd33abcea02c1a31e83e8bd.1722803521.git.lilah@lunabee.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 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: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter 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: -2.44 X-Spam-Score: -2.44 X-Migadu-Queue-Id: C6ABE7B8BB X-Migadu-Scanner: mx11.migadu.com X-TUID: cr8WtCarNuF9 * gnu/services/virtualization.scm (%virtual-build-machine-operating-system): Remove bootloader. (%hurd-vm-operating-system): Remove targets. * gnu/system/hurd.scm (%hurd-default-operating-system): Remove targets. * gnu/tests.scm (%simple-os), gnu/tests/ganeti.scm (%ganeti-os), gnu/tests/image.scm (%simple-efi-os), gnu/tests/install.scm (%minimal-os, %minimal-extlinux-os, %minimal-os-on-vda, %separate-home-os, %separate-store-os, %raid-root-os, %encrypted-root-os, %lvm-separate-home-os, %encrypted-home-os, %encrypted-home-os-key-file, %encrypted-root-not-boot-os, %btrfs-root-os-source, %btrfs-raid-root-os-source, %btrfs-root-on-subvolume-os, %btrfs-raid10-root-os, %jfs-root-os, %f2fs-root-os, %xfs-root-os), gnu/tests/nfs.scm (%base-os), gnu/tests/telephony.scm (make-jami-os), gnu/tests/vnc.scm (%xvnc-os): Update bootloader targets. Change-Id: I3d66a839a9b2a73b8b65946950728b1e0155ca1e --- gnu/services/virtualization.scm | 11 ++--- gnu/system/hurd.scm | 4 +- gnu/tests.scm | 4 +- gnu/tests/ganeti.scm | 4 +- gnu/tests/image.scm | 4 +- gnu/tests/install.scm | 72 ++++++++++++++++++++++++--------- gnu/tests/nfs.scm | 4 +- gnu/tests/telephony.scm | 4 +- gnu/tests/vnc.scm | 4 +- tests/boot-parameters.scm | 2 +- 10 files changed, 77 insertions(+), 36 deletions(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.= scm index d87e494348..f698532a94 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1191,17 +1191,13 @@ (define %minimal-vm-syslog-config (define %virtual-build-machine-operating-system (operating-system (host-name "build-machine") - (locale "en_US.utf8") (locale-definitions ;; Save space by providing only one locale. (list (locale-definition (name "en_US.utf8") (source "en_US") (charset "UTF-8")))) - - (bootloader (bootloader-configuration ;unused - (bootloader grub-minimal-bootloader) - (targets '("/dev/null")))) + ;; no bootloader (file-systems (cons (file-system ;unused (mount-point "/") (device "none") @@ -1624,9 +1620,8 @@ (define %hurd-vm-operating-system (host-name "childhurd") (timezone "Europe/Amsterdam") (bootloader (bootloader-configuration - (bootloader grub-minimal-bootloader) - (targets '("/dev/vda")) - (timeout 0))) + (bootloader grub-minimal-bootloader) + (timeout 0))) (packages (cons* gdb-minimal (operating-system-packages %hurd-default-operating-system))) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index cbe0081382..af04e82485 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -119,9 +119,7 @@ (define %hurd-default-operating-system (kernel %hurd-default-operating-system-kernel) (kernel-arguments '()) (hurd hurd) - (bootloader (bootloader-configuration - (bootloader grub-minimal-bootloader) - (targets '("/dev/vda")))) + (bootloader (bootloader-configuration (bootloader grub-minimal-bootloa= der))) (initrd #f) (initrd-modules '()) (firmware '()) diff --git a/gnu/tests.scm b/gnu/tests.scm index 5ff9db82fc..f46ccf5174 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -237,7 +237,9 @@ (define %simple-os =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device"/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm index 29eb354044..789879b26f 100644 --- a/gnu/tests/ganeti.scm +++ b/gnu/tests/ganeti.scm @@ -40,7 +40,9 @@ (define %ganeti-os =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vda")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vda")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/tests/image.scm b/gnu/tests/image.scm index be6852cae0..8d960cf7b8 100644 --- a/gnu/tests/image.scm +++ b/gnu/tests/image.scm @@ -55,7 +55,9 @@ (define %simple-efi-os (inherit %simple-os) (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")))))) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))))))) =20 ;; An MBR disk image with a single ext4 partition. (define i1 diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 18a2fc119b..d67a71f12e 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -103,7 +103,9 @@ (define-os-with-source (%minimal-os %minimal-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -141,7 +143,9 @@ (define-os-with-source (%minimal-extlinux-os =20 (bootloader (bootloader-configuration (bootloader extlinux-gpt-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -434,7 +438,9 @@ (define-os-with-source (%minimal-os-on-vda %minimal-os-= on-vda-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vda")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vda")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -510,7 +516,9 @@ (define-os-with-source (%separate-home-os %separate-hom= e-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons* (file-system (device (file-system-label "my-root")) @@ -565,7 +573,9 @@ (define-os-with-source (%separate-store-os %separate-st= ore-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons* (file-system (device (file-system-label "root-fs")) @@ -642,7 +652,9 @@ (define-os-with-source (%raid-root-os %raid-root-os-sou= rce) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) =20 ;; Add a kernel module for RAID-1 (aka. "mirror"). @@ -725,7 +737,9 @@ (define-os-with-source (%encrypted-root-os %encrypted-r= oot-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) =20 ;; Note: Do not pass "console=3DttyS0" so we can use our passphrase pr= ompt ;; detection logic in 'enter-luks-passphrase'. @@ -858,7 +872,9 @@ (define-os-with-source (%lvm-separate-home-os %lvm-sepa= rate-home-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) =20 (mapped-devices (list (mapped-device @@ -943,7 +959,9 @@ (define-os-with-source (%encrypted-home-os %encrypted-h= ome-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) =20 ;; Note: Do not pass "console=3DttyS0" so we can use our passphrase pr= ompt ;; detection logic in 'enter-luks-passphrase'. @@ -1070,7 +1088,9 @@ (define-os-with-source (%encrypted-home-os-key-file =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))) (extra-initrd "/key-file.cpio"))) (kernel-arguments '("console=3DttyS0")) =20 @@ -1130,7 +1150,9 @@ (define-os-with-source (%encrypted-root-not-boot-os =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) =20 (mapped-devices (list (mapped-device (source @@ -1232,7 +1254,9 @@ (define-os-with-source (%btrfs-root-os %btrfs-root-os= -source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -1306,7 +1330,9 @@ (define-os-with-source (%btrfs-raid-root-os %btrfs-ra= id-root-os-source) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) =20 (file-systems (cons (file-system @@ -1374,7 +1400,9 @@ (define-os-with-source (%btrfs-root-on-subvolume-os (locale "en_US.UTF-8") (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons* (file-system (device (file-system-label "btrfs-pool")) @@ -1467,7 +1495,9 @@ (define-os-with-source (%btrfs-raid10-root-os (bootloader (map (lambda (targ) (bootloader-configuration (bootloader grub-bootloader) - (targets (list targ)))) + (targets (list (bootloader-target + (type 'disk) + (device targ)))))) '("/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde"))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons* (file-system @@ -1577,7 +1607,9 @@ (define-os-with-source (%jfs-root-os %jfs-root-os-sou= rce) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -1650,7 +1682,9 @@ (define-os-with-source (%f2fs-root-os %f2fs-root-os-s= ource) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -1723,7 +1757,9 @@ (define-os-with-source (%xfs-root-os %xfs-root-os-sou= rce) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=3DttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 0d9972e0e9..2f97126df7 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -51,7 +51,9 @@ (define %base-os =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems %base-file-systems) (users %base-user-accounts) (packages (cons* diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm index f03ea963f7..ee858d9c91 100644 --- a/gnu/tests/telephony.scm +++ b/gnu/tests/telephony.scm @@ -90,7 +90,9 @@ (define* (make-jami-os #:key provisioning? partial?) =20 (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm index ab1c2749f3..cba9c565e0 100644 --- a/gnu/tests/vnc.scm +++ b/gnu/tests/vnc.scm @@ -51,7 +51,9 @@ (define %xvnc-os (locale "en_US.UTF-8") (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/tests/boot-parameters.scm b/tests/boot-parameters.scm index f214de360d..f343dbdfdb 100644 --- a/tests/boot-parameters.scm +++ b/tests/boot-parameters.scm @@ -63,7 +63,7 @@ (define %root-path "/") =20 (define %grub-boot-parameters (boot-parameters - (bootloader-name 'grub) + (bootloader-name '(grub)) (root-device %default-root-device) (label %default-label) (kernel %default-kernel) --=20 2.45.2