From patchwork Wed Oct 30 14:30:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 69640 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 5167127BBE2; Wed, 30 Oct 2024 14:34:58 +0000 (GMT) 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_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 EEC1B27BBE9 for ; Wed, 30 Oct 2024 14:34:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t69m1-0002Ff-I9; Wed, 30 Oct 2024 10:34:13 -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 1t69lw-0002Dc-Ky for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:08 -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 1t69lw-0003dr-9g; Wed, 30 Oct 2024 10:34:08 -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=I+C+6Dj1zp6oNcFaSE4cVC+7aebqI8fUIIxrJPvfWdI=; b=nLUmSNJLdhdxUsygUBhKg1sdjQw2Yx4lidPnJsV9DjOOV0EFNbdykZfwhDPcXDKYshmEWrIH8hPR+v010q4OnMwQbWQDN/byqIVsVGNp/aruCZsymgTzzb2JHGYmUyHno4qxDj7H0ZvynuGtEHkL5dZT+49zyoANHzaEbHgJqhaZJVZ4w/ij5iPsfdEEj+G3emoEyRvM5+67l+SWvq+j5iKpxeLvvmZdYttx+QULsrcEbYkYLq4zXRCK4ARL3fArP29d59ISIGjRJeE8lPJXkUgf8mgSVirbgQWuhvDqWfj783cFOoaAc0FtuATtIXF5k3ugaMat+RQyRKI3prcjuQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t69lq-0003xv-Sw; Wed, 30 Oct 2024 10:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v4 02/18] reconfigure: Use native bootloader package for running the installer. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 30 Oct 2024 14:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73927@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 73927-submit@debbugs.gnu.org id=B73927.173029880615054 (code B ref 73927); Wed, 30 Oct 2024 14:34:02 +0000 Received: (at 73927) by debbugs.gnu.org; 30 Oct 2024 14:33:26 +0000 Received: from localhost ([127.0.0.1]:35301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lF-0003uj-AK for submit@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69l9-0003tj-7K for 73927@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t69iy-0003KW-3e; Wed, 30 Oct 2024 10:31:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=I+C+6Dj1zp6oNcFaSE4cVC+7aebqI8fUIIxrJPvfWdI=; b=jbBEWhwJ6OIcOzSrgwlI 5OstrLZQ6gDk8oHlRcKkZGvVZwMHH28p3ZY2qaeOc7O73ngdYvPyXQhrWdhhgefTj1NnxjLEY2Oeo uFdRE+T27+d5TUP8mpN9YtOOx1Hi2HN+srvngMc/o2mrouWZSNulVmXWSlm5VKKyAQn27HmID/Q/E ILSNR4CyKykEnMHMobv0Vi2MfpGs9fBMfnDJqto5hxXy0r4e7qFlay07J1qKjZrHluLyACVRYh0/d LZVqlg92n+IsC3e7GUfOf5BOqLpqk1dtOdZFDRYKIO0ZVCFEUFIXjcE3rxT/vyi1syZM76x9RSVzY LUqfvy9RI09NUg==; From: Janneke Nieuwenhuizen Date: Wed, 30 Oct 2024 15:30:31 +0100 Message-ID: <8772fc6a589621f7a343ac7432ebc705cd8dfac6.1730296564.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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: , 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 This fixes running grub-install when using guix system init --target. * guix/scripts/system/reconfigure.scm (install-bootloader): Use native package when invoking install-bootloader-program. Change-Id: I48d80a8dff866ada3625d827dd3036fb966eee9a --- guix/scripts/system/reconfigure.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 604ba08fee..ddb561d28c 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2022 Arun Isaac +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -299,7 +300,7 @@ (define* (install-bootloader eval configuration bootcfg (eval #~(parameterize ((current-warning-port (%make-void-port "w"))) (primitive-load #$(install-bootloader-program installer disk-installer - package + #~#+package bootcfg bootcfg-file devices