From patchwork Fri Sep 20 04:44:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 68158 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 7CBAD27BBEA; Fri, 20 Sep 2024 05:44:52 +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 F3D4327BBE2 for ; Fri, 20 Sep 2024 05:44:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srVVe-000528-LT; Fri, 20 Sep 2024 00:44:46 -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 1srVVc-00051X-EH for guix-patches@gnu.org; Fri, 20 Sep 2024 00:44:44 -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 1srVVc-0000WK-5p for guix-patches@gnu.org; Fri, 20 Sep 2024 00:44:44 -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=jG3aqzpL/zQ0Qa6gcFGrkNhpBPh7xXviUnyxQ6yCd3w=; b=tcHCUq3odhTDTz0t5r2lnvZsfEIL3FISlyVcUbjUTWZkqfm3CDKQ4khnXjQdkFokbAsRtgYEo/DKOT8CwK0B/SplVQDHNFEjYxUXP1dc15J+CyNeQqG4pkfmPU6c1mndVZJNC17b6fVhRI4DOxZp0Q0BA3w4bZeokVdEa4Cx7Yu3FO2OG+4sh3hjRY6rvEQBBoT3PWXN8Co8NuPnAWyRajdW9F7nbZsz2Hl1+cx9ZMWW3+Nxpmuae/K+oGmBVZHkdDQudT8gYb68Zu7QbJ7ESCPUiWOX8bZWsgHKz6WIw8aCI+w3phHUn+Yl0WqoHg22ACfmU/bqEjy1x5CnQcmwXA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srVVu-0006t2-F4 for guix-patches@gnu.org; Fri, 20 Sep 2024 00:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v5 00/15] Rewrite bootloader subsystem. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 04:45: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: Herman Rimm Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172680747626412 (code B ref 72457); Fri, 20 Sep 2024 04:45:02 +0000 Received: (at 72457) by debbugs.gnu.org; 20 Sep 2024 04:44:36 +0000 Received: from localhost ([127.0.0.1]:33840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srVVU-0006rw-6g for submit@debbugs.gnu.org; Fri, 20 Sep 2024 00:44:36 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:49200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srVVR-0006re-86 for 72457@debbugs.gnu.org; Fri, 20 Sep 2024 00:44:34 -0400 DKIM-Signature: a=rsa-sha256; b=PtcnbBVA38Jn01J92b7C+/EnHaPATC5jqYEAYN2z6xDtxsXqM7w0iKrk0uEKZws/1cxh1BNTJK7nAb93bsjRroTXQz3e2t6raSAyYe4halbs/qRg6doC1g6ulXXvXUraDubqGLOfbuWLCp5RvjjHwxDt0VJdgjxunkGmhGdDpXLMdqwp3hP3hPE/7ZiVrDllKTEYYaE6z1i5UvPlMdoa1TmTCmrAOPpTYb7ak6ed5acr2Bk3E6bE0ZOGy5mXPwabnbvmfvscAEymRCA0PlFKxQuhdmGLcIiY1lpox1cBfFShEngFpgqEaeJXzRVv2KidYfw1naRUnlKixVooTapqCQ==; s=purelymail3; d=lunabee.space; v=1; bh=Xf27MDy5gpO+nbJtFdkhMRttgOATZWGVqHot7aFvJP0=; h=Received:Subject:From:To:Date; DKIM-Signature: a=rsa-sha256; b=Yji7D7pYutLTWZffm7bhsajbu44QRLZPUVDxhAhwyeI492anixsJQ3uEu8YzWW6+0h2SlXbXRJ3F009Xvz6w3dYRSdzTtbuR72SvdT/2myiOgRlpdqibbYHpE16mKHjsDyRp4ijehxnVsXF1CL3tFBfTRv2lqj5/zmrLZn0g9hVJsy1PlHpwpgfjxhkT7oP9F48k27OXQT/84EVcBWCfJH2k1W5/o7r+xZrdJvMchoeJDy2J/ZFCFbmyEDXKzNK6OvLfNldQQIeb+bolIDCjMaHOSVFIX9UqajoJ3XuS0pIENQOojq+Q3E5F4Ti/f68gdXBohrSl0JK7/V4TwcoVQA==; s=purelymail3; d=purelymail.com; v=1; bh=Xf27MDy5gpO+nbJtFdkhMRttgOATZWGVqHot7aFvJP0=; h=Feedback-ID:Received:Subject:From:To: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 56994385; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 20 Sep 2024 04:44:08 +0000 (UTC) Message-ID: <6e0c4db72a80076590d6faa6ae82f45e6672c16c.camel@lunabee.space> Date: Thu, 19 Sep 2024 23:44:07 -0500 In-Reply-To: References: <6v2spbtqb66twxchy4wkmoq6fyjqtrr2g3mhotwignplqwjxl4@qpeqf5d6hxow> Organization: Dissociation for Heresiographal Computation User-Agent: Evolution 3.48.4 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: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter 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 untested cause my local tree's a mess rn. has the diff you requested integrated :) line counts are off cause it's a diff on the snippet you sent me - lilah (type 'esp) (offset 'root) diff -ru a/gnu/bootloader.scm b/gnu/bootloader.scm --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -5,22 +5,26 @@ (seen '())) (match targets ((target rest ...) - (let (type (bootloader-target-type target))) + (let ((type (bootloader-target-type target))) (when (memq type seen) (error loc (G_ "target with duplicate type~%") duplicate)) - (loop rest (cons type seen))) + (loop rest (cons type seen)))) (() #t)))) -(define-with-syntax-properties (warn-update-targets (targets properties)) - (let ((targets (if (list? targets) targets (list targets))) +(define-with-syntax-properties (warn-update-targets (value properties)) + (let ((targets (if (list? value) value (list value))) (loc (source-properties->location properties))) (define string->target (match-lambda ((? bootloader-target? target) target) ((? string? s) (if (string-prefix? "/dev" s) - (bootloader-target - (type 'disk) - (device s)) + (if (string-rindex s char-set:digit) + (bootloader-target + (type 'part) + (device s)) + (bootloader-target + (type 'disk) + (device s))) (bootloader-target