From patchwork Sun Aug 4 19:52:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 66700 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 C735827BBEA; Sun, 4 Aug 2024 20:54:54 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 946D527BBE2 for ; Sun, 4 Aug 2024 20:54:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sahJW-0005rm-76; Sun, 04 Aug 2024 15:54: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 1sahJR-0005ra-Hh for guix-patches@gnu.org; Sun, 04 Aug 2024 15:54: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 ) id 1sahJR-0002H5-6x for guix-patches@gnu.org; Sun, 04 Aug 2024 15:54:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:In-Reply-To:References:MIME-Version:To:Subject; bh=98fX7hNbWOkf2rfHyypGVd6AJ0hmhZqS4soEUpj6NuQ=; b=KzKLNdJvi7TOjseiyAzdeCZFPdbpbTqo0/njqXBRMVSPSW/JAX4wBwsPLhxGuW1Ri6DZahlZ4eqxHNcwr2hMxCHcJ0sUXvi5BINRk+hCWObDzTmI0ZN+aple8m6Kwuig47IriCZJziIo/NKQLVIcOOAmEaxv3bT4QD+V9Potk7c+Vyg9lsRSQpnJOSPX8O+I8pjwouELIHdJCA6xIl46AgPiEc+g7kuAXpMd+m6vZSo14wZOIUQzJkUAO7A8dhvuHR4SmHkgCT+K3jZOiV372ifBZiTjHzA4wrGVO3ApjQUB4j9LDWlMXQ5Qb1krs1g483TxPqi6HRJNC0GsuRuF2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sahJm-0003rJ-CR for guix-patches@gnu.org; Sun, 04 Aug 2024 15:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v2 00/15] Rewrite bootloader subsystem. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 19:55: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: Lilah Tascheter Cc: 72457@debbugs.gnu.org, Tomas Volf <~@wolfsden.cz> Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172280129614802 (code B ref 72457); Sun, 04 Aug 2024 19:55:02 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 19:54:56 +0000 Received: from localhost ([127.0.0.1]:57290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahJf-0003qg-Vw for submit@debbugs.gnu.org; Sun, 04 Aug 2024 15:54:56 -0400 Received: from mail-lj1-f176.google.com ([209.85.208.176]:57416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahJd-0003q6-BV for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 15:54:54 -0400 Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2eeb1ba0481so151519811fa.2 for <72457@debbugs.gnu.org>; Sun, 04 Aug 2024 12:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1722801206; x=1723406006; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=98fX7hNbWOkf2rfHyypGVd6AJ0hmhZqS4soEUpj6NuQ=; b=GgLswU1/oU7Lpy4d5dXuHUzUFB++Vh0pY/0IDtNDcf/XclMpxpIvw2epZWNk8RMQKW qpRXJSIBoHejzfOJvset7Fw0GN2pZWOPAnRWXPZi3uy5Fh/TXofMPjT3HUUJsVJYpDzi YEhl0cEXfyfB17QRAFow3YjXyhPXj2KasMkDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722801206; x=1723406006; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=98fX7hNbWOkf2rfHyypGVd6AJ0hmhZqS4soEUpj6NuQ=; b=Snot7YaLHBZaMt8c/wVb5oEvrWre+JMkrN/BvKqa9pXKG2a61Oj4jepD668y9XHn4Q S6kp3ncDPha5ILTfFLd77MGEkAn/BvsajXsRldT7ztEwR/nnT4Ej3kQNVw07udkz01Vs L45qSyftZIrEy7pVKZx3kms34X/fCTkn4NtgRcq4qgqj9soEVzSyjAGPAQmst7Hm5Doo n2pAhiz2KZjpaGMjg5PzNfzkC6UCubrOtz2FakLKgoFq1zeewknEY22YouJcmKDN5vT6 /7o6Cwd1QvcoYY7+ncGZ1BlysYYug4SaRTIqKZNTHtcP/x69knx0GnM9jezMOu5Hi9TB uULg== X-Gm-Message-State: AOJu0Yz7ks90NcOB3itq6bLD7D5gkxXdqIALw2rjXZLM3W4Zt//vKcHr hlKdVnW8mbaGdjXSEvVnmAoMQ6CpZFcq8jM6g17Dyj1+pBKi1d7JTaP1/n8TbLwajAp7JUL6jxW bHN4JCdS1dOQlLryY/QiR8uP6WYUbo85IaKxTMA== X-Google-Smtp-Source: AGHT+IHHN3r3g74P/hvn+lhr1MGipI5bDs8TcmMROeRtvcl+A27Pzwv3Ez0mnxOzsw7F+V1ROn3Zw4EmS3aqsK0UtXA= X-Received: by 2002:a2e:b163:0:b0:2ef:2a68:beca with SMTP id 38308e7fff4ca-2f15aabcd73mr58345851fa.24.1722801205546; Sun, 04 Aug 2024 12:53:25 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Sergey Trofimov Date: Sun, 4 Aug 2024 21:52:49 +0200 Message-ID: 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 Lilah Tascheter writes: > Thanks you two! This patch series should fix those issues; feel free to > double-check though :) > I've found a couple typos, although fixing these doesn't make it work for me. I get an error in fixuuid. --8<---------------cut here---------------start------------->8--- In unknown file: 2 (string=? #f "ntfs") 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 string=: Wrong type argument in position 1 (expecting string): #f --8<---------------cut here---------------end--------------->8--- Here is a patch for the typos. --8<---------------cut here---------------start------------->8--- ((string=? file-system "iso9660") 'iso9660) (else 'dce)))) --8<---------------cut here---------------end--------------->8--- diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index a83d057bda..70b4c02447 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -584,13 +584,13 @@ (define (normalize targets) (unfold-pathcat target targets))))) (label (or label (accessible=> device read-partition-label))) (uuid (or uuid (accessible=> device read-partition-uuid))) - (file-system (or file-system (and=> device (assoc-mnt mount-type)))) + (file-system (or file-system (and=> device (assoc-mnt mount-point)))) (offset (and path offset)) (path (or path (and=> device (assoc-mnt mount-point)))))))) (define (fixuuid target) (match-record target (uuid file-system) - (let ((type (cond ((member file-system '("vfat" "fat32") 'fat)) + (let ((type (cond ((member file-system '("vfat" "fat32")) 'fat) ((string=? file-system "ntfs") 'ntfs)