From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNaZh-0007Ec-Bs for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNaZg-0003BF-A3 for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gNaZf-00039r-Aq for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gNaZf-00016N-7c for guix-patches@gnu.org; Fri, 16 Nov 2018 04:38:03 -0500 Subject: [bug#33405] [PATCH 08/10] guix system: Simplify bootloader package handling. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Nov 2018 10:36:22 +0100 Message-Id: <20181116093624.4820-8-ludo@gnu.org> In-Reply-To: <20181116093624.4820-1-ludo@gnu.org> References: <20181116093624.4820-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33405@debbugs.gnu.org * guix/scripts/system.scm (perform-action): Remove 'bootloader-package' variable. Pass (bootloader-package bootloader) as the 2nd argument to 'bootloader-installer-derivation'. Remove BOOTLOADER-PACKAGE from DRVS since it's redundant. --- guix/scripts/system.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index c0f16cb2a7..14488107b8 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -851,11 +851,6 @@ static checks." #:mappings mappings)) (bootloader -> (bootloader-configuration-bootloader (operating-system-bootloader os))) - (bootloader-package - (let ((package (bootloader-package bootloader))) - (if package - (package->derivation package) - (return #f)))) (bootcfg (if (eq? 'container action) (return #f) (lower-object @@ -870,17 +865,15 @@ static checks." (let ((installer (bootloader-installer bootloader)) (target (or target "/"))) (bootloader-installer-derivation installer - bootloader-package + (bootloader-package bootloader) bootloader-target target))) ;; For 'init' and 'reconfigure', always build BOOTCFG, even if ;; --no-bootloader is passed, because we then use it as a GC root. ;; See . (drvs -> (if (memq action '(init reconfigure)) - (if (and install-bootloader? bootloader-package) - (list sys bootcfg - bootloader-package - bootloader-installer) + (if install-bootloader? + (list sys bootcfg bootloader-installer) (list sys bootcfg)) (list sys))) (% (if derivations-only? -- 2.19.1