From patchwork Tue Aug 6 17:37:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakob L. Kreuze" X-Patchwork-Id: 14876 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 C22491725C; Tue, 6 Aug 2019 18:42:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6B4891723A for ; Tue, 6 Aug 2019 18:42:11 +0100 (BST) Received: from localhost ([::1]:35328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hv3TO-0003Gm-V2 for patchwork@mira.cbaines.net; Tue, 06 Aug 2019 13:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57576) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hv3TI-0003Fr-Cu for guix-patches@gnu.org; Tue, 06 Aug 2019 13:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hv3TH-0002Og-1W for guix-patches@gnu.org; Tue, 06 Aug 2019 13:42:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hv3TG-0002OZ-Uv for guix-patches@gnu.org; Tue, 06 Aug 2019 13:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hv3TG-0002vG-Qd for guix-patches@gnu.org; Tue, 06 Aug 2019 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36947] [PATCH] reconfigure: Fix GC root installation. Resent-From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Aug 2019 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36947@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156511326311160 (code B ref -1); Tue, 06 Aug 2019 17:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Aug 2019 17:41:03 +0000 Received: from localhost ([127.0.0.1]:37721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hv3SJ-0002tv-Aa for submit@debbugs.gnu.org; Tue, 06 Aug 2019 13:41:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:45703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hv3SD-0002tM-Lf for submit@debbugs.gnu.org; Tue, 06 Aug 2019 13:41:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57436) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hv3SC-0003CH-Hr for guix-patches@gnu.org; Tue, 06 Aug 2019 13:40:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hv3SB-0001dC-Fg for guix-patches@gnu.org; Tue, 06 Aug 2019 13:40:56 -0400 Received: from mx.sdf.org ([205.166.94.20]:50030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hv3SB-0001Xu-8E for guix-patches@gnu.org; Tue, 06 Aug 2019 13:40:55 -0400 Received: from Epsilon (pool-173-76-53-40.bstnma.fios.verizon.net [173.76.53.40]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x76HeicQ015705 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Tue, 6 Aug 2019 17:40:47 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Date: Tue, 06 Aug 2019 13:37:32 -0400 Message-ID: <87h86uxkir.fsf@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Fixes . Reported by ison . guix/scripts/system/reconfigure.scm (install-bootloader-program): Switch new symlink to the canonical bootloader configuration file. --- guix/scripts/system/reconfigure.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index dee0c24bd2..72d97b6c48 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -196,7 +196,7 @@ BOOTLOADER-PACKAGE." (srfi srfi-35)) (let* ((gc-root (string-append #$target %gc-roots-directory "/bootcfg")) (temp-gc-root (string-append gc-root ".new"))) - (switch-symlinks temp-gc-root gc-root) + (switch-symlinks temp-gc-root #$bootcfg) (install-boot-config #$bootcfg #$bootcfg-file #$target) ;; Preserve the previous activation's garbage collector root ;; until the bootloader installer has run, so that a failure in