From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GDn3JQwf82Z8lAAA62LTzQ:P1 (envelope-from ) for ; Tue, 24 Sep 2024 20:20:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GDn3JQwf82Z8lAAA62LTzQ (envelope-from ) for ; Tue, 24 Sep 2024 22:20:28 +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=AlkNM3U4; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=hWGKkWac; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727209228; 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=Jxizlh1m4PsrNo/HNbkyg0PJqjHTRVuFUAJvFuP76Ko=; b=C4OkZNi7aQpMnARuHj1pSyFXrOpnd0lLlBAghGUNiyBxcaDTyDvZNZav/IQ7O6Oy5Pk+GF HR2Y83vSkn1CslkVV7YRS272i7r5VrXIhxdqdhWNrPRhAD4dcIYbw39O2JQp8q9dLqRxPP MqbQaR7HFj5UH7FNmGZEGrN8KruZyr/RrIRfFEyQqur2V30BBUCgMK+7hVihsZoN4kbjXJ cWW/oQR3ueBcXsqYDkm3msNZu6QZVSSwFnn53ysN6AW6yxHP6IlC0DGnqcRprBA5f3ztg2 BTtZDYsGhS0JRIbjQY5Oxj04qpkcAttJ+n9A6qrlp2jl5svV4JLmUsm8c5Xlcw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727209228; a=rsa-sha256; cv=none; b=q4DaxktFezfNsm4XZapuCTPR+a/fKtwHD66Am0AOCAoNY8miuMWM96jkTrAzHh188z+3na o4lLwHaQB6Genfh6yVMUv622qLXR6WMMmrllhYiGF+OuhHeFId45bbAFvoEqPWaTnxJrEN uqz8T1PA2MUtEhveCPuWtYb7Q316vuZYjyLsfjr+0HxO6SAE4yJGKuZ60/axgKEdRtSh6G g//Qgy/F+PZ7GnmwLkNK9fbrw7t5Jgq8Yyfez6hvnAtlYh8hrlZGlJKg6UEmhu07TN9P0k cJR0CWfoARQxR6SvfwZIip0uoDY2IjEEnrsU6Zbpwe3tKYaKVD2y4Mnaw+jvSg== 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=AlkNM3U4; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=hWGKkWac; 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"; dmarc=pass (policy=none) header.from=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 6ACE87A76D for ; Tue, 24 Sep 2024 22:20:28 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stC1C-0006Lx-Um; Tue, 24 Sep 2024 16:20:20 -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 1stC0Z-0005qe-IP for guix-patches@gnu.org; Tue, 24 Sep 2024 16:19:40 -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 1stC0X-0002vd-Fx; Tue, 24 Sep 2024 16:19:37 -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=Jxizlh1m4PsrNo/HNbkyg0PJqjHTRVuFUAJvFuP76Ko=; b=AlkNM3U4Xvj+OcgxsYNGfc4VaRQx7Gb91Xta+7pdZ/fzPzlViDKU+rtGMuNKxfi4r+oolxjzaklTTgZ/Jd1ylWvC1xu29sZtLrUUfUPrXzYrmMcG1SnR2xN8ddzfzraW5tyt5dHaEeY688Ev38CdDXyytLQx3L24LlcLXO+bCgA/n/ycJpr5LWAKwVpOCXJ6vXTRke2kj1EGb9WI/BoKaQTfQBEY/uEVapp2izTZWdeBNlxBb5YQqy1bxI8oNg+0MwK6hSnLzuG7hPKObwzk3rGjQ2/W95CZOYFNbf5falPELV0HJlI1hVi3d/rfjWiinrHZN8OxCQfzKC7znTRy7Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stC0w-0004pb-8W; Tue, 24 Sep 2024 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v6 11/12] gnu: system: Update examples. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 24 Sep 2024 20:20:02 +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 , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172720915018468 (code B ref 72457); Tue, 24 Sep 2024 20:20:02 +0000 Received: (at 72457) by debbugs.gnu.org; 24 Sep 2024 20:19:10 +0000 Received: from localhost ([127.0.0.1]:38469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC05-0004nW-0J for submit@debbugs.gnu.org; Tue, 24 Sep 2024 16:19:09 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59577 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stBzg-0004ik-U5 for 72457@debbugs.gnu.org; Tue, 24 Sep 2024 16:18:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727202617; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=Jxizlh1m4PsrNo/HNbkyg0PJqjHTRVuFUAJvFuP76Ko=; b=hWGKkWac6OlU4gkQt43hJYdL/gOFrz3R9+ovFHpzkVPISwFODaaIQYMQKtQxa9exOSQc9N WRO0Eb3KaqVl9gNZRnpUrdOGAQ9PVy/EDKGH5dNc6wOPdKXloUl8yryqczeoGNYxhz1RQh B5ve3fztPvAiJWVnXTfn7rg6WdLyyTa1BSAzhDe7N+2xFSbIapARy2SbbGhis/q9zdeUhs 6YMi4mxxnpQ1Se78m0aDWaysmk7YdKEVh2MenkYmU7tkXQyxNc888rcGEAd55KlBaRa1N1 t7AETjx2ssXY7nsUDJtNjTxtTeTV6Y+SKumY7oOpyIyI0QEtxyvKoIhkAT4fhw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0553e8fe (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 24 Sep 2024 18:30:17 +0000 (UTC) Date: Tue, 24 Sep 2024 20:29:18 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm 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-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.52 X-Migadu-Queue-Id: 6ACE87A76D X-Spam-Score: -5.52 X-TUID: kmyr8Pej+cVi From: Lilah Tascheter * gnu/system/examples/asus-c201.tmpl (bootloader): Use new depthcharge bootloader name scheme and update to new target system. * gnu/system/examples/bare-bones.tmpl (bootloader), gnu/system/examples/bare-hurd.tmpl (bootloader), gnu/system/examples/beaglebone-black.tmpl (bootloader), gnu/system/examples/desktop.tmpl (bootloader), gnu/system/examples/lightweight-desktop.tmpl (bootloader), gnu/system/examples/plasma.tmpl (bootloader): Use new target system. * gnu/system/examples/docker-image.tmpl (bootloader): Delete. * gnu/system/examples/vm-image.tmpl (bootloader): Use auto image target. Change-Id: I3675f17ae9cd94cff99328762600fb4e491bc9f2 --- gnu/system/examples/asus-c201.tmpl | 6 ++++-- gnu/system/examples/bare-bones.tmpl | 7 +++++-- gnu/system/examples/bare-hurd.tmpl | 4 +++- gnu/system/examples/beaglebone-black.tmpl | 4 +++- gnu/system/examples/desktop.tmpl | 4 +++- gnu/system/examples/docker-image.tmpl | 6 ++---- gnu/system/examples/lightweight-desktop.tmpl | 4 +++- gnu/system/examples/plasma.tmpl | 4 +++- gnu/system/examples/vm-image.tmpl | 5 ++--- 9 files changed, 28 insertions(+), 16 deletions(-) diff --git a/gnu/system/examples/asus-c201.tmpl b/gnu/system/examples/asus-c201.tmpl index 019111c167..eec185eebf 100644 --- a/gnu/system/examples/asus-c201.tmpl +++ b/gnu/system/examples/asus-c201.tmpl @@ -14,8 +14,10 @@ ;; Assuming /dev/mmcblk0p1 is the kernel partition, and ;; "my-root" is the label of the target root file system. (bootloader (bootloader-configuration - (bootloader depthcharge-bootloader) - (targets '("/dev/mmcblk0p1")))) + (bootloader depthcharge-veyron-speedy-bootloader) + (targets (list (bootloader-target + (type 'part) + (device "/dev/mmcblk0p1")))))) ;; The ASUS C201PA requires a very particular kernel to boot, ;; as well as the following arguments. diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 7b6a4b09b0..9eed05f2e0 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -13,10 +13,13 @@ ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the ;; target hard disk, and "my-root" is the label of the target - ;; root file system. + ;; root file system. If you're just building an image, the + ;; 'targets' field may be omitted. (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) ;; It's fitting to support the equally bare bones ‘-nographic’ ;; QEMU option, which also nicely sidesteps forcing QWERTY. (kernel-arguments (list "console=ttyS0,115200")) diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 463c7ee798..8dd700cd9d 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -32,7 +32,9 @@ (inherit %hurd-default-operating-system) (bootloader (bootloader-configuration (bootloader grub-minimal-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/system/examples/beaglebone-black.tmpl b/gnu/system/examples/beaglebone-black.tmpl index 18bbb2723c..397fc2766e 100644 --- a/gnu/system/examples/beaglebone-black.tmpl +++ b/gnu/system/examples/beaglebone-black.tmpl @@ -15,7 +15,9 @@ ;; the label of the target root file system. (bootloader (bootloader-configuration (bootloader u-boot-beaglebone-black-bootloader) - (targets '("/dev/mmcblk1")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/mmcblk1")))))) ;; This module is required to mount the SD card. (initrd-modules (cons "omap_hsmmc" %base-initrd-modules)) diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 2d65f22294..30dbdeea31 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -20,7 +20,9 @@ ;; Partition mounted on /boot/efi. (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))) (keyboard-layout keyboard-layout))) ;; Specify a mapped device for the encrypted root partition. diff --git a/gnu/system/examples/docker-image.tmpl b/gnu/system/examples/docker-image.tmpl index 7123917af4..6d3114a0bc 100644 --- a/gnu/system/examples/docker-image.tmpl +++ b/gnu/system/examples/docker-image.tmpl @@ -9,6 +9,8 @@ (timezone "Europe/Berlin") (locale "en_US.utf8") + ;; Bootloader can be left blank! + ;; This is where user accounts are specified. The "root" account is ;; implicit, and is initially created with the empty password. (users (cons (user-account @@ -34,10 +36,6 @@ ;; similar services for us. ;; This will be ignored. - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets '("does-not-matter")))) - ;; This will be ignored, too. (file-systems (list (file-system (device "does-not-matter") (mount-point "/") diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index c061284ba8..0964238cb0 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -17,7 +17,9 @@ ;; Partition mounted on /boot/efi. (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")))) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))))) ;; Assume the target root file system is labelled "my-root", ;; and the EFI System Partition has UUID 1234-ABCD. diff --git a/gnu/system/examples/plasma.tmpl b/gnu/system/examples/plasma.tmpl index c3850ffe37..a81916ffe9 100644 --- a/gnu/system/examples/plasma.tmpl +++ b/gnu/system/examples/plasma.tmpl @@ -15,7 +15,9 @@ ;; is the label of the target root file system. (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems (cons (file-system (device "my-root") diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 589de493b1..050c0bb971 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -38,11 +38,10 @@ accounts.\x1b[0m (firmware '()) - ;; Below we assume /dev/vda is the VM's hard disk. - ;; Adjust as needed. + ;; Images automatically get the 'root, 'esp, and 'disk targets configured as + ;; needed. (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vda")) (terminal-outputs '(console)))) (file-systems (cons (file-system (mount-point "/") -- 2.45.2