Message ID | cover.1722803521.git.lilah@lunabee.space |
---|---|
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4726827BBEA; Sun, 4 Aug 2024 21:34:12 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 56F7927BBE9 for <patchwork@mira.cbaines.net>; Sun, 4 Aug 2024 21:34:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1sahvE-00026B-EN; Sun, 04 Aug 2024 16:33:44 -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 <Debian-debbugs@debbugs.gnu.org>) id 1sahvB-00025r-S2 for guix-patches@gnu.org; Sun, 04 Aug 2024 16:33:42 -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 <Debian-debbugs@debbugs.gnu.org>) id 1sahvA-0008Cv-In for guix-patches@gnu.org; Sun, 04 Aug 2024 16:33:40 -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:Date:From:To:In-Reply-To:References:Subject; bh=EFonuNbA7PIJsbWPZh8uWXN1FRSeq43OjVNpvnVpUWg=; b=nOLu2LnLlZYUoAZxkKWvC2tscDSxWXY8qDg+V1Gz15I+Fxe1obpjGk5MrMZuuCGMZrk/AmTWebpa5Y9iVG4aLWTooFauxy30qUyysoCp32pXLu8I25GNiejt5NI5q2BVgg2INsGBoz7aJ2ORG8Yn11vB2/UbWqEpx4rMrD6k4UtIqRqNopPJZhXH092tujxJE8UqXjlFEZZtDrL0+nh/lzCeUD0qqKVfcIbx8xM1tlQ4DwjWiiwGR9u1dqi8uTAHJRTt+4DdLl03KUbW07Fz2LVK4hZdbqQ7TtIGCCp+FQrZ0p01jsNDYIfRuWkJWFzwL3xRfGYG8csO0UYSFr2Tbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1sahvV-0006Gj-MV for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v3 00/15] Rewrite bootloader subsystem. References: <cover.1722741997.git.lilah@lunabee.space> In-Reply-To: <cover.1722741997.git.lilah@lunabee.space> Resent-From: Lilah Tascheter <lilah@lunabee.space> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 20:34:01 +0000 Resent-Message-ID: <handler.72457.B72457.172280363824073@debbugs.gnu.org> 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 <lilah@lunabee.space>, Sergey Trofimov <sarg@sarg.org.ru> Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172280363824073 (code B ref 72457); Sun, 04 Aug 2024 20:34:01 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 20:33:58 +0000 Received: from localhost ([127.0.0.1]:57316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1sahvR-0006GC-Ay for submit@debbugs.gnu.org; Sun, 04 Aug 2024 16:33:57 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:56706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lilah@lunabee.space>) id 1sahvO-0006Fg-Q8 for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 16:33:56 -0400 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=OemBHpPuorGtnuH09j1BvnmiVJWtf/tbeNT35dqir82Der1w5ij45IxTf20P37DYb3MHl4J5brgz+6R404LGbm9AlLhXht90qPUFQc1nKVKGVvbiC/sCZvAKIbDZQugxllRmBG41PdaMqLGOuoqAQkhta/spoRS1a2piffMVtbEMlXiIjCmztY2sTTvhHGRbeGi9fMr0RU4JkyAkYgoxkm50XV7uywjgfiR2kpSm+94cS6MFVZ/FmowiYXowAyR7tdwQowTSXhSxcyKghgBtxl33XxhNbpVyJtKhHsFRTNuuTzLqzYW67OdFp0YWKN2fp1Y/sDfXSH9W5Xr62uFvow==; s=purelymail2; d=lunabee.space; v=1; bh=RszGE/vLjSHeE8K209srWOGPF91DxQfxXbd/YQb6mSA=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=OhvROM0AvG+yI5WdFbtVUf8nAkKzMDyc96Tc8Au5mULVoSbteKKte2Lqys2lgiyv/iVq1KWPQ2XHsp83yAbickSCLVhI5k7d9Ft2wffGQFmgxYmvQ6LTGe/JYQWU50oZPSfDzAIwDYka9wIQPgVMrW6/xLQ6Qo2pAj2F4xzHcx4ow7r5LeTlGVxV9iJW7a7aeuv02uVixzZ6ThiDNxz+WaJsIBexAvAj8bSFFhhhtwh+AU1Gimfn4KAusYBW6Eu6ize3KvwUun12clSWCXBktDzwVxd01n4ikyGHSE3BmL1RBQDZO1iQBO+qHy/KH6nSVO7a2IkzI02IOVKfQ0iY7A==; s=purelymail2; d=purelymail.com; v=1; bh=RszGE/vLjSHeE8K209srWOGPF91DxQfxXbd/YQb6mSA=; 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:23 +0000 (UTC) Date: Sun, 4 Aug 2024 15:31:46 -0500 Message-ID: <cover.1722803521.git.lilah@lunabee.space> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> From: Lilah Tascheter via Guix-patches <guix-patches@gnu.org> Reply-To: Lilah Tascheter <lilah@lunabee.space> 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 |
Series |
Rewrite bootloader subsystem.
|
|
Message
Lilah Tascheter
Aug. 4, 2024, 8:31 p.m. UTC
Goddamnit, alright, how's this? And thanks for the patch :) though, the file-system bit there is supposed to be mount-type. The file-system field holds the filesystem type; path holds mountpoint. Lilah Tascheter (15): guix: scripts: Rewrite reinstall-bootloader to use provenance data. gnu: Add bootloader target infastructure. guix: scripts: Remove unused code. gnu: Core bootloader changes. gnu: system: Remove useless boot parameters. gnu: bootloader: Add raspberry pi bootloader. gnu: system: Fix bootloader crypto device recognition. gnu: packages: Add pesign. gnu: packages: Add ukify. gnu: packages: Add systemd-stub. gnu: bootloaders: Add uki-efi-bootloader. gnu: system: Update examples. doc: Update bootloader documentation. gnu: tests: Update tests to new targets system. teams: Add bootloading team. doc/guix.texi | 458 +++--- etc/teams.scm | 10 + gnu/bootloader.scm | 662 ++++++--- gnu/bootloader/depthcharge.scm | 153 +- gnu/bootloader/extlinux.scm | 149 +- gnu/bootloader/grub.scm | 1279 +++++++---------- gnu/bootloader/u-boot.scm | 505 +++---- gnu/bootloader/uki.scm | 96 ++ gnu/build/bootloader.scm | 157 +- gnu/build/image.scm | 40 +- gnu/build/install.scm | 16 +- gnu/image.scm | 3 + gnu/installer/parted.scm | 12 +- gnu/local.mk | 1 + gnu/machine/ssh.scm | 71 +- gnu/packages/bootloaders.scm | 277 ++-- gnu/packages/efi.scm | 47 + gnu/packages/raspberry-pi.scm | 18 - gnu/services/virtualization.scm | 11 +- gnu/system.scm | 62 +- gnu/system/boot.scm | 16 +- 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 | 6 +- 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 +- .../examples/raspberry-pi-64-nfs-root.tmpl | 23 +- gnu/system/examples/raspberry-pi-64.tmpl | 18 +- gnu/system/examples/vm-image.tmpl | 5 +- gnu/system/hurd.scm | 4 +- gnu/system/image.scm | 162 ++- gnu/system/images/hurd.scm | 4 +- gnu/system/images/novena.scm | 3 +- .../images/orangepi-r1-plus-lts-rk3328.scm | 3 +- gnu/system/images/pine64.scm | 3 +- gnu/system/images/pinebook-pro.scm | 3 +- gnu/system/images/rock64.scm | 3 +- gnu/system/images/unmatched.scm | 3 +- gnu/system/images/visionfive2.scm | 3 +- gnu/system/images/wsl2.scm | 14 +- gnu/system/install.scm | 43 +- gnu/system/vm.scm | 11 - gnu/tests.scm | 4 +- gnu/tests/ganeti.scm | 4 +- gnu/tests/image.scm | 4 +- gnu/tests/install.scm | 80 +- gnu/tests/nfs.scm | 4 +- gnu/tests/reconfigure.scm | 86 +- gnu/tests/telephony.scm | 4 +- gnu/tests/vnc.scm | 4 +- guix/scripts/system.scm | 162 +-- guix/scripts/system/reconfigure.scm | 159 +- guix/ui.scm | 8 + tests/boot-parameters.scm | 16 +- 57 files changed, 2389 insertions(+), 2535 deletions(-) create mode 100644 gnu/bootloader/uki.scm base-commit: 7d781027c78bdea5fdb3f1c9c9ec432b9606d2b5
Comments
Hi Lilah, On Sun, 4 Aug 2024 at 22:33, Lilah Tascheter <lilah@lunabee.space> wrote: > > Goddamnit, alright, how's this? Unfortunately it still doesn't work. Here is my debug session: Error: --8<---------------cut here---------------start------------->8--- In srfi/srfi-1.scm: 586:17 8 (map1 (#f #<<uuid> type: fat bv: #vu8(77 160 163 107)> #<<uuid> type: dce bv: #vu8(246 188 138 216 255 26 23 84 83 48 172 24 246 188 138 216)> #<<uuid> type: fat bv: #vu8(77 160 163 107)>)) In ice-9/eval.scm: 293:34 7 (_ #(#(#(#(#(#(#<directory (gnu bootloader) 7f49dbce61e0>) #f (#f #<<uuid> type: fat bv: #vu8(77 160 163 107)> #<<uuid> type: dce bv: #vu8(246 188 138 216 255 26 23 84 83 48 172 24 246 188 138 216)> #<<uuid> type: fat bv: #vu8(77 160 163 107)>)) #<procedure up (a)>) (#f)) (#f #f)) #<procedure offset (a)>)) 191:35 6 (_ #(#(#(#(#(#(#<directory (gnu bootloader) 7f49dbce61e0>) #f (#f #<<uuid> type: fat bv: #vu8(77 160 163 107)> #<<uuid> type: dce bv: #vu8(246 188 138 216 255 26 23 84 83 48 172 24 246 188 138 216)> #<<uuid> type: fat bv: #vu8(77 160 163 107)>)) #<procedure up (a)>) (#f)) (#f #f)) #<procedure offset (a)>)) 163:9 5 (_ #(#(#(#(#(#(#<directory (gnu bootloader) 7f49dbce61e0>) #f (#f #<<uuid> type: fat bv: #vu8(77 160 163 107)> #<<uuid> type: dce bv: #vu8(246 188 138 216 255 26 23 84 83 48 172 24 246 188 138 216)> #<<uuid> type: fat bv: #vu8(77 160 163 107)>)) #<procedure up (a)>) (#f)) (#f #f)) #<procedure offset (a)>)) In srfi/srfi-1.scm: 586:17 4 (map1 (#f)) In ice-9/eval.scm: 263:9 3 (_ #(#(#<directory (gnu bootloader) 7f49dbce61e0>) #f)) 155:9 2 (_ _) In ice-9/boot-9.scm: 1685:16 1 (raise-exception _ #:continuable? _) 1685:16 0 (raise-exception _ #:continuable? _) ice-9/boot-9.scm:1685:16: In procedure raise-exception: In procedure struct-vtable: Wrong type argument in position 1 (expecting struct): #f --8<---------------cut here---------------end--------------->8--- Trying to debug it in REPL: --8<---------------cut here---------------start------------->8--- ,m (gnu bootloader) ,use (gnu bootloader grub) (bootloader-configuration->gexp (bootloader-configuration (bootloader grub-efi-bootloader) (targets (list (bootloader-target (type 'esp) (path "/boot"))))) '()) --8<---------------cut here---------------end--------------->8--- List of targets passed to normalize: --8<---------------cut here---------------start------------->8--- #<<bootloader-target> type: vendir expected?: #f path: "EFI/Guix" offset: #<procedure offset (a)> device: #f file-system: #f label: #f uuid: #f> #<<bootloader-target> type: install expected?: #f path: "boot" offset: #<procedure offset (a)> device: #f file-system: #f label: #f uuid: #f> #<<bootloader-target> type: root expected?: #f path: "/" offset: #<procedure offset (x)> device: #f file-system: #f label: #f uuid: #f> #<<bootloader-target> type: esp expected?: #f path: "/boot" offset: #<procedure feb5818 at <unknown port>:132:19 (x)> device: #f file-system: #f label: #f uuid: #f>) --8<---------------cut here---------------end--------------->8--- (mounts): --8<---------------cut here---------------start------------->8--- #<<mount> devno: 21 source: "none" point: "/proc" type: "proc" options: "rw,relatime"> #<<mount> devno: 6 source: "none" point: "/dev" type: "devtmpfs" options: "rw,relatime"> #<<mount> devno: 22 source: "none" point: "/sys" type: "sysfs" options: "rw,relatime"> #<<mount> devno: 2050 source: "/dev/sda2" point: "/" type: "ext4" options: "rw,relatime"> #<<mount> devno: 2049 source: "/dev/sda1" point: "/boot" type: "vfat" options: "rw,relatime"> #<<mount> devno: 24 source: "none" point: "/dev/pts" type: "devpts" options: "rw,relatime"> #<<mount> devno: 8 source: "none" point: "/sys/kernel/debug" type: "debugfs" options: "rw,relatime"> #<<mount> devno: 25 source: "tmpfs" point: "/dev/shm" type: "tmpfs" options: "rw,nosuid,nodev,relatime"> #<<mount> devno: 26 source: "efivarfs" point: "/sys/firmware/efi/efivars" type: "efivarfs" options: "rw,relatime"> #<<mount> devno: 2050 source: "/dev/sda2" point: "/gnu/store" type: "ext4" options: "ro,noatime"> #<<mount> devno: 27 source: "none" point: "/run/systemd" type: "tmpfs" options: "rw,nosuid,nodev,noexec,relatime"> #<<mount> devno: 28 source: "none" point: "/run/user" type: "tmpfs" options: "rw,nosuid,nodev,noexec,relatime"> #<<mount> devno: 29 source: "none" point: "/sys/fs/cgroup" type: "cgroup2" options: "rw,relatime"> #<<mount> devno: 30 source: "cgroup" point: "/sys/fs/cgroup/elogind" type: "cgroup" options: "rw,relatime"> #<<mount> devno: 31 source: "tmpfs" point: "/run/user/1000" type: "tmpfs" options: "rw,nosuid,nodev,relatime"> #<<mount> devno: 33 source: "portal" point: "/run/user/1000/doc" type: "fuse.portal" options: "rw,nosuid,nodev,relatime"> --8<---------------cut here---------------end--------------->8--- (disk-partitions): ("sda" "sda1" "sda2") labels: sda1: GNU-ESP sda2: Guix_image uuids: --8<---------------cut here---------------start------------->8--- (read-partition-uuid "/dev/sda2") #vu8(246 188 138 216 255 26 23 84 83 48 172 24 246 188 138 216) (read-partition-uuid "/dev/sda1") #vu8(77 160 163 107) --8<---------------cut here---------------end--------------->8--- It seems that device couldn't be guessed for the vendir target, as (unfold-pathcat) returns a path (/boot/EFI/Guix) that is not in (mounts).