From patchwork Wed May 27 07:24:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 22405 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 A7DA227BBE3; Wed, 27 May 2020 08:25:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 519BA27BBE1 for ; Wed, 27 May 2020 08:25:16 +0100 (BST) Received: from localhost ([::1]:33080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdqR9-0005Ff-S4 for patchwork@mira.cbaines.net; Wed, 27 May 2020 03:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdqQx-0004zR-Gb for guix-patches@gnu.org; Wed, 27 May 2020 03:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdqQx-0001A2-7h for guix-patches@gnu.org; Wed, 27 May 2020 03:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jdqQx-0003hz-54 for guix-patches@gnu.org; Wed, 27 May 2020 03:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41560] [PATCH 4/8] image: Add bootloader installation support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 May 2020 07:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41560@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 41560-submit@debbugs.gnu.org id=B41560.159056428814180 (code B ref 41560); Wed, 27 May 2020 07:25:03 +0000 Received: (at 41560) by debbugs.gnu.org; 27 May 2020 07:24:48 +0000 Received: from localhost ([127.0.0.1]:48082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdqQf-0003gU-0O for submit@debbugs.gnu.org; Wed, 27 May 2020 03:24:48 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:46857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdqQY-0003fH-Kq for 41560@debbugs.gnu.org; Wed, 27 May 2020 03:24:39 -0400 Received: by mail-wr1-f45.google.com with SMTP id x6so9314496wrm.13 for <41560@debbugs.gnu.org>; Wed, 27 May 2020 00:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3u6s9vKgGdEf0fP5fd97l00XZVvE5+/6SAPejDuI1Rk=; b=cXODQtjsQfOCTK3bUpmvdtBPnR02WIn5XN0tqrchie3bgAQW9F1gNUgHOr2eMv4m+U thVacMG1S2AVt63m5RFHoDkzr1/Sl5BOm6Cungbe36NQEny3xYfRUD9XZogNuWzzop1X 0mIG7dxfNrrnd07Kgo7UfQ1aaTNoVsIY/zBqekodTHhplyNh46trxpJiH1mfX6gCCfGa yhUOf4JguDF7XY9AUJJ/c9w55/VAkscVyqBzpPjDeL7wduKp0+PUdShQBbRMChEz5hYO 4RNiU7Zw0I3EdLmO7QkukqVMavpXZ9jpVHQhZrQA/3eNC7scmPjq7d4X+JR8E0/hroP6 RsyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3u6s9vKgGdEf0fP5fd97l00XZVvE5+/6SAPejDuI1Rk=; b=N4CqybXkb32eeUiSgrp7UVRUALovDVHi9EB9FI2w2JzL7ZMvCNfYsDXSfmjJJ+SwtF IPnQM0nAg+MjlcF9TpOyOSBk7FePpel4tSYCDJ5Pexd0IsqnAz56r2X+Nxh163MvrOQc KoyB+NpAG8E+SpldEUIiyS5sRob2cTwyas09AMmKRD9cAHhHG0kY/pMruqAe+nAxFWtP I8FkeD3A+HUR+y6ZFdCHe/gS7LiHAHIBXAc+DYwu6tirXPf+LwTo+x/wYXHYlGkvmO39 XrISi3sgBwrTy0SGAHPfeDdD/sdcCXgQFZVrQwv53ztU0DPk0xalYeno5xAsWWd8tDN4 m5hA== X-Gm-Message-State: AOAM533sJbyDSPLHMD04/Q69Gl+jsVoyX0aMPA/KttWcpYyzU71uk6q8 7/s9Myc50+WEDUDar37sWt5wEYy541w= X-Google-Smtp-Source: ABdhPJzGqsFpidDfKHAhDIVANe6lcklDbNCVjMJ1s/YGXVpqXNSjjAGAEuBIFHqGilZ6Xz3wiSPB5Q== X-Received: by 2002:adf:9f48:: with SMTP id f8mr23546478wrg.228.1590564272795; Wed, 27 May 2020 00:24:32 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:e5a2:3f70:d249:6ce9]) by smtp.gmail.com with ESMTPSA id v28sm2002845wra.77.2020.05.27.00.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 00:24:31 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe Date: Wed, 27 May 2020 09:24:16 +0200 Message-Id: <20200527072420.26140-4-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200527072420.26140-1-othacehe@gnu.org> References: <20200527072420.26140-1-othacehe@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/build/image.scm (initialize-root-partition): Add bootloader-package and bootloader-installer arguments. Run the bootloader-installer if defined. * gnu/system/image.scm (system-disk-image): Adapt the partition initializer call accordingly. --- gnu/build/image.scm | 5 +++++ gnu/system/image.scm | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index b37ea9332a..49faeab466 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -155,6 +155,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." #:key bootcfg bootcfg-location + bootloader-package + bootloader-installer (deduplicate? #t) references-graphs (register-closures? #t) @@ -178,6 +180,9 @@ of the directory of the 'system' derivation." #:deduplicate? deduplicate?)) references-graphs)) + (when bootloader-installer + (display "installing bootloader...\n") + (bootloader-installer bootloader-package #f root)) (when bootcfg (install-boot-config bootcfg bootcfg-location root))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index ffc746fcf5..6608991fdc 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -236,7 +236,9 @@ used in the image." #:deduplicate? #f #:system-directory #$os #:bootloader-package - #$(bootloader-package bootloader) + #+(bootloader-package bootloader) + #:bootloader-installer + #+(bootloader-installer bootloader) #:bootcfg #$bootcfg #:bootcfg-location #$(bootloader-configuration-file bootloader)))))