From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SEUMGw6vz153PAAA0tVLHw (envelope-from ) for ; Thu, 28 May 2020 12:31:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id OErzFg6vz170NAAAB5/wlQ (envelope-from ) for ; Thu, 28 May 2020 12:31:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 18D26940D3B for ; Thu, 28 May 2020 12:31:10 +0000 (UTC) Received: from localhost ([::1]:54368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeHgj-0006OF-3m for larch@yhetil.org; Thu, 28 May 2020 08:31:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeHgc-0006O5-8v for guix-patches@gnu.org; Thu, 28 May 2020 08:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39694) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jeHgb-00034u-VY for guix-patches@gnu.org; Thu, 28 May 2020 08:31:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jeHgb-0007pl-TI for guix-patches@gnu.org; Thu, 28 May 2020 08:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37305] [PATCH v3] Allow booting from a Btrfs subvolume Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 May 2020 12:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37305 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: Pierre Neidhardt , 37305-done@debbugs.gnu.org Received: via spool by 37305-done@debbugs.gnu.org id=D37305.159066902530068 (code D ref 37305); Thu, 28 May 2020 12:31:01 +0000 Received: (at 37305-done) by debbugs.gnu.org; 28 May 2020 12:30:25 +0000 Received: from localhost ([127.0.0.1]:51240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeHg0-0007ou-W7 for submit@debbugs.gnu.org; Thu, 28 May 2020 08:30:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeHfz-0007of-Fg for 37305-done@debbugs.gnu.org; Thu, 28 May 2020 08:30:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59912) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeHfs-0002rr-Fn; Thu, 28 May 2020 08:30:17 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38524 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jeHfr-0000oL-F4; Thu, 28 May 2020 08:30:15 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <875zg2xtsb.fsf@gmail.com> <87lfoxbn2e.fsf@gnu.org> <87v9n1pts1.fsf@raisin.i-did-not-set--mail-host-address--so-tickle-me> <87o8qmheqm.fsf@ambrevar.xyz> <874ksebkup.fsf_-_@gmail.com> <87y2pohpqx.fsf@gnu.org> <87v9kqpyhu.fsf@gmail.com> <87sgfuclh8.fsf@gnu.org> <87tv09epux.fsf@ambrevar.xyz> <87lflc65ra.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 Prairial an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 28 May 2020 14:30:14 +0200 In-Reply-To: <87lflc65ra.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 28 May 2020 00:30:17 -0400") Message-ID: <87tv00ckdl.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: RpiaRSSKEN5w Hello! Maxim Cournoyer skribis: > From ee23cc391cce7b8dcdcb5146d4b84a55881a5cb9 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Wed, 27 May 2020 22:44:28 -0400 > Subject: [PATCH] bootloader: grub: Rename the btrfs-subvolume-file-name > parameter. > > Following discussion in , it seems more > appropriate to give the parameter a more generic name that better describ= es > what it does. > > * gnu/bootloader/grub.scm (normalize-file): Rename the > btrfs-subvolume-file-name parameter to store-directory-prefix. > (eye-candy): Likewise. > (grub-configuration-file): Likewise. > * gnu/system.scm (operating-system-bootcfg): Adapt. [...] > (define* (eye-candy config store-device store-mount-point > - #:key btrfs-store-subvolume-file-name system port) > + #:key store-directory-prefix system port) > "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg'= part > concerned with graphics mode, background images, colors, and all that. > STORE-DEVICE designates the device holding the store, and STORE-MOUNT-PO= INT is > its mount point; these are used to determine where the background image = and > fonts must be searched for. SYSTEM must be the target system string---e= .g., > -\"x86_64-linux\". BTRFS-STORE-SUBVOLUME-FILE-NAME is the file name of t= he > -Btrfs subvolume, to be prepended to any store path, if any." > +\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to prepe= nd to > +any store path." s/path/file name/ :-) Maybe you can have =E2=80=98store-directory-prefix=E2=80=99 default to "" a= nd adjust users accordingly. Otherwise LGTM. Thanks for taking the time to work on this patch! Ludo=E2=80=99.