From patchwork Wed May 27 07:24:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 22406 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 4C4FB27BBE3; Wed, 27 May 2020 08:25:17 +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 D251527BBE1 for ; Wed, 27 May 2020 08:25:16 +0100 (BST) Received: from localhost ([::1]:33132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdqRA-0005Gz-DQ for patchwork@mira.cbaines.net; Wed, 27 May 2020 03:25:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdqQx-0004zK-2L for guix-patches@gnu.org; Wed, 27 May 2020 03:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdqQw-00019y-Q7 for guix-patches@gnu.org; Wed, 27 May 2020 03:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jdqQw-0003hs-NE for guix-patches@gnu.org; Wed, 27 May 2020 03:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41560] [PATCH 3/8] bootloader: grub: Use inheritance to define grub-minimal-bootloader. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 May 2020 07:25:02 +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.159056428514169 (code B ref 41560); Wed, 27 May 2020 07:25:02 +0000 Received: (at 41560) by debbugs.gnu.org; 27 May 2020 07:24:45 +0000 Received: from localhost ([127.0.0.1]:48080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdqQe-0003gS-O4 for submit@debbugs.gnu.org; Wed, 27 May 2020 03:24:44 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:42105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdqQX-0003fE-3W for 41560@debbugs.gnu.org; Wed, 27 May 2020 03:24:37 -0400 Received: by mail-wr1-f52.google.com with SMTP id s8so22880202wrt.9 for <41560@debbugs.gnu.org>; Wed, 27 May 2020 00:24:37 -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=b6gAbAXk7mSId+VcsNLp/kq0nzKzexZBANc9WFo4R6o=; b=l/qW2fJnKGaYN9AI5qQZEqqGyjb50jA+D0RJBJcs+cZFmq3WuY/Kir+ceVwd8lz3ai WZD0s5RUcAHuX2v6XgGLCtfmhE4j5OcRdEW6uls2bzWAetJnvT2J9GWYjX8l7bYXUkSQ dAtffbTtHyWuu53UX0TvovYMiCHzQ1CRlfLYGuZQ6y9adOx2N/JQPU15RtYU3jbDL7oF eX+0GNv3NIOW3K6WH3CLsAXXB7PeHX04ekqEjmvx7og9etI+OBzMDh2TwKVEM9uqy65A zrO8J/h6flWajgGM+/yo5oKKKkiyKUa6pWC3ZlDHAQ4lCvKktUS48B96SNbTJrlvKPZn qJyw== 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=b6gAbAXk7mSId+VcsNLp/kq0nzKzexZBANc9WFo4R6o=; b=r7mkhvUyJ+AlEyzCbjDN1hwIpqvEVQ686B2F4xJj5wr3v0BnjHCe5eISDtCq0TCy4J X4QEmUCu5GwHxIkV9H7R41rvkBQ+5rqM8cW0n4z9eY8JQ32sbMCJ6WI+zJKsMJJLlM4t vQJjbdRQjLBs1SNUiPIi1lz000SFxY1RhnXGc9MCVeVawzDGmWvnMemcRAxdj9fKAfK1 hKBJyRMxvo+AlaBACipJhne572fwZfecqOBQr7ReKU+paK3Np6W4drlpXSASX9JFq5WS z6VgoXuw+4vRoT6/18/2kLChnc5tvjR93B3ZBmvvf5GH+lbjjlQD/R+AIBZzETGaNWKa sD6A== X-Gm-Message-State: AOAM531sHFy5R5GzzLUrfX/slLDXvi67v7/WMtxpyZR7LAsROcP+8L0J L1uvdIt+m5vQ0PAuG79WOmyGbPokU0A= X-Google-Smtp-Source: ABdhPJxpQ2DFUQNIHL+sMUA2PiVin4LZrEfzT8dKLA1MZs+0ZXxUG2oouyKlkIzwdHibGgX11+LqaQ== X-Received: by 2002:adf:f207:: with SMTP id p7mr23569252wro.206.1590564271283; Wed, 27 May 2020 00:24:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 00:24:30 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe Date: Wed, 27 May 2020 09:24:15 +0200 Message-Id: <20200527072420.26140-3-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/bootloader/grub.scm (grub-minimal-bootloader): Inherit from grub-bootloader to avoid field redefinition. --- gnu/bootloader/grub.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 29bec92196..388f29d3a8 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -516,13 +516,10 @@ fi~%")))) (configuration-file "/boot/grub/grub.cfg") (configuration-file-generator grub-configuration-file))) -(define grub-minimal-bootloader +(define* grub-minimal-bootloader (bootloader - (name 'grub) - (package grub-minimal) - (installer install-grub) - (configuration-file "/boot/grub/grub.cfg") - (configuration-file-generator grub-configuration-file))) + (inherit grub-bootloader) + (package grub-minimal))) (define* grub-efi-bootloader (bootloader