From unknown Tue Jun 17 22:11:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Jun 2018 20:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31959 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31959@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152987112224947 (code B ref -1); Sun, 24 Jun 2018 20:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jun 2018 20:12:02 +0000 Received: from localhost ([127.0.0.1]:34125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBMf-0006UA-Sv for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:12:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBMe-0006Tu-BQ for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:12:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXBMX-0003PJ-Pz for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:11:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55960) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXBMX-0003Ou-LT for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:11:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXBMU-00079b-FT for guix-patches@gnu.org; Sun, 24 Jun 2018 16:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXBMR-0003Bu-1D for guix-patches@gnu.org; Sun, 24 Jun 2018 16:11:50 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50259) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXBMQ-00035P-31 for guix-patches@gnu.org; Sun, 24 Jun 2018 16:11:46 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 773A820DDC for ; Sun, 24 Jun 2018 16:11:44 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 24 Jun 2018 16:11:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=2J92k1dJpuSyG1poiaWEWhwQLUsMSPlyr4DiFQYM0 Mc=; b=Vy/uVlPl3H7U587R7p9kHldkOUKlfBCIizztwAbU322fIeEnm/jBpGRhn kKBFI677SM+ssvmz2s8YwNhxN339r6josCdRA6VOKNfRtL6DuuhENT2syCPyXbxV qHAxQKXdA27tTsl2e/MsO6FKvU1LiBgYSDCS1NJm7OcKG+7VJxEW7BF7hglg+ku4 /xHpAi3OqHb7wQEzy3OCGQMoF4PeyG8jTBgIr/K9Yhq0NIAUWUQDk6CuCnH2MEfF 0TalzuNETWmMId183eEYaq4BPBbeEIWlwH2R67/pK/C9NEzXeGVx2N1CwtB7gFOe KLeaOcNV94xzI/+P1tFXyPoy3DdAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=2J92k1dJpuSyG1poi aWEWhwQLUsMSPlyr4DiFQYM0Mc=; b=X3/Huw2ultnC+dOB2JAKe0Dlg2nStI0+P t8MzIp2Blams52R2p3y6TaEWTwRh3g/aN25wDmoApwSJOfg4StvjUMvUixPMwZRZ nTGS28vNNZ+G3Qupqgq8ZB6Zuaka3uIR9La6kSHGVLBLMGo3+IwTlCp/8btKk75m ddaspDKQWJfpG9dJt2AXtK7Ttk+dHrrTvTqP0THeKODL4h1/1kHqBa85FsjWFsTg dIDJQhtmjfRLe4EmMc0UXxQ6jC4EBt3fUv8pUh2Ny+1Mvc4+BdHj/RP74OiSz/1B BEHi1fLOSyFTYgsv+TANrnJv/Y2TviSq+dpSLaKH2GZ6xw9A5GFMQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (ti0005a400-0034.bb.online.no [88.91.194.35]) by mail.messagingengine.com (Postfix) with ESMTPA id F3B22E4434 for ; Sun, 24 Jun 2018 16:11:43 -0400 (EDT) From: Marius Bakke Date: Sun, 24 Jun 2018 22:11:41 +0200 Message-Id: <20180624201141.29124-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.4 (-----) * gnu/bootloader/grub.scm (install-grub-efi): When MOUNT-POINT/EFI-DIR exists, install there rather than EFI-DIR directly. --- gnu/bootloader/grub.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index a131f3b50..8371888fa 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -387,12 +387,17 @@ submenu \"GNU system, old configurations...\" {~%") ;; Install GRUB onto the EFI partition mounted at EFI-DIR, for the ;; system whose root is mounted at MOUNT-POINT. (let ((grub-install (string-append bootloader "/sbin/grub-install")) - (install-dir (string-append mount-point "/boot"))) + (install-dir (string-append mount-point "/boot")) + ;; When installing GuixSD, it's common to mount EFI-DIR below + ;; MOUNT-POINT rather than /boot/efi on the live image. + (target-esp (if (file-exists? (string-append mount-point efi-dir)) + (string-append mount-point efi-dir) + efi-dir))) ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") (unless (zero? (system* grub-install "--boot-directory" install-dir - "--efi-directory" efi-dir)) + "--efi-directory" target-esp)) (error "failed to install GRUB (EFI)"))))) -- 2.18.0 From unknown Tue Jun 17 22:11:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Marius Bakke Subject: bug#31959: closed (Re: [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT.) Message-ID: References: <87369fo1st.fsf@devup.no> <20180624201141.29124-1-mbakke@fastmail.com> X-Gnu-PR-Message: they-closed 31959 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 31959@debbugs.gnu.org Date: Tue, 07 Apr 2020 13:37:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1586266622-13468-1" This is a multi-part message in MIME format... ------------=_1586266622-13468-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31959: [PATCH] bootloader: grub-efi: Support EFI directories relative to M= OUNT-POINT. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31959@debbugs.gnu.org. --=20 31959: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31959 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1586266622-13468-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31959-done) by debbugs.gnu.org; 7 Apr 2020 13:36:45 +0000 Received: from localhost ([127.0.0.1]:49728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLoPE-0003SY-FJ for submit@debbugs.gnu.org; Tue, 07 Apr 2020 09:36:44 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:33039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLoPD-0003RZ-Aj for 31959-done@debbugs.gnu.org; Tue, 07 Apr 2020 09:36:43 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 593F75CD for <31959-done@debbugs.gnu.org>; Tue, 7 Apr 2020 09:36:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 07 Apr 2020 09:36:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=jqAGyHNuRLLGIAnxR2qEFfkd+e yjioHRH+/bOLIQOjI=; b=UiX8+VqpvQLDZmOW31/P/qtiDzC+lstnCjYCPc/3VE bgMmRHkzdvxxHgRcuc02GUGyIAptRILsoxlHJ+VJLHZ+755crU6WDuAW89vC3X9e U0NMxGvSQiuJ9Aa1aPqSrc4r6EbJMIWdJKMBPVVNuTpYnPz7MkkSpWKxj9zcvyr6 deEcTmI9I/CYDY6Jy0yBhnmSjX/gNMDDZNg2nwPwnvtBNpzmcSAkRHsXd3u+lg1q GlsGDmYwTtaEAm059UPBeBRjAxpKphYG3viK5BX/D+MtWiUVDWomBy6Mce+a3CSb HyGjtTlkCO1gz42IJU8tUZVo0fPZgdH49UWTKMK1OtVA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=jqAGyH NuRLLGIAnxR2qEFfkd+eyjioHRH+/bOLIQOjI=; b=0SFvObwbHvl3NYGc7+uNgT ijcvFbQoc8voQFdyr2eRZg6HK643DWdZNuGbYSdQFr30n3OJChEVIXTAwSHeegyr 8t8uke6PIixZ108A5YDhr0KZecRabxTw4ZzesYWqk8bkItvPhOxagW1AE7ITOdYy ZUyvi4xceLfT5QFGMZ1vKSXMGrMRA3zo00w0chHKBf98OlUtrWRdqkCcV6Fy5Wd4 Jgz7rv2HVvskjFO8IAeQSKq2QqFgKE4vEE9B+U3a4mF85Qxu2gojT8hqQ3NrsDAu c7Bxe11I4deUO58+Bfi2XPUF94BlZmcbwdofbr64DLuGU6a1DMwGsReA8k7HWw9A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudehgdeihecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufgjfhgffffkgggtsehgtderre dtredtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhm rghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 8C6B63280063 for <31959-done@debbugs.gnu.org>; Tue, 7 Apr 2020 09:36:36 -0400 (EDT) From: Marius Bakke To: 31959-done@debbugs.gnu.org Subject: Re: [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT. In-Reply-To: <20180624201141.29124-1-mbakke@fastmail.com> References: <20180624201141.29124-1-mbakke@fastmail.com> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Tue, 07 Apr 2020 15:36:34 +0200 Message-ID: <87369fo1st.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31959-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Marius Bakke writes: > * gnu/bootloader/grub.scm (install-grub-efi): When MOUNT-POINT/EFI-DIR exists, > install there rather than EFI-DIR directly. Pushed way back in aa5a549c65485ff826267a48795c1564af17f1c9. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6MgeIACgkQoqBt8qM6 VPpCCAf/VpXM4VluEXtgPkZA2mMKD5E4dwLVUoFKSNb0/SB0AEB2d5ClzYlRhs6u isn9n7s0b1tp7ONG17NKLvE72hH6Cldqw7s6QhcsIkWht0yIkXrJNoivAFAoF2/S zslGuZDv+ySS5Q2GCkxcYtwBO5H/ueKkdMCIIZJUnMLdh+lt65NSr0HYIe2kzgOA RX+dtF6uxixL4h71G+gNFn8DmdCtYSNY1xRe6w6KfXJYJ55WpiGaEdPu2MMQ8IOu Dd+rfmnxTeNUF95DL4vJK6nyF3EKPuG/39C1gIkmvm3y9ssV53pooKQP0HRtDwhi KpgrN9sG9mOTMKp72neOCvJ9b7z96Q== =0xtS -----END PGP SIGNATURE----- --=-=-=-- ------------=_1586266622-13468-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 24 Jun 2018 20:12:02 +0000 Received: from localhost ([127.0.0.1]:34125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBMf-0006UA-Sv for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:12:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBMe-0006Tu-BQ for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:12:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXBMX-0003PJ-Pz for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:11:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55960) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXBMX-0003Ou-LT for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:11:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXBMU-00079b-FT for guix-patches@gnu.org; Sun, 24 Jun 2018 16:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXBMR-0003Bu-1D for guix-patches@gnu.org; Sun, 24 Jun 2018 16:11:50 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50259) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXBMQ-00035P-31 for guix-patches@gnu.org; Sun, 24 Jun 2018 16:11:46 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 773A820DDC for ; Sun, 24 Jun 2018 16:11:44 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 24 Jun 2018 16:11:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=2J92k1dJpuSyG1poiaWEWhwQLUsMSPlyr4DiFQYM0 Mc=; b=Vy/uVlPl3H7U587R7p9kHldkOUKlfBCIizztwAbU322fIeEnm/jBpGRhn kKBFI677SM+ssvmz2s8YwNhxN339r6josCdRA6VOKNfRtL6DuuhENT2syCPyXbxV qHAxQKXdA27tTsl2e/MsO6FKvU1LiBgYSDCS1NJm7OcKG+7VJxEW7BF7hglg+ku4 /xHpAi3OqHb7wQEzy3OCGQMoF4PeyG8jTBgIr/K9Yhq0NIAUWUQDk6CuCnH2MEfF 0TalzuNETWmMId183eEYaq4BPBbeEIWlwH2R67/pK/C9NEzXeGVx2N1CwtB7gFOe KLeaOcNV94xzI/+P1tFXyPoy3DdAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=2J92k1dJpuSyG1poi aWEWhwQLUsMSPlyr4DiFQYM0Mc=; b=X3/Huw2ultnC+dOB2JAKe0Dlg2nStI0+P t8MzIp2Blams52R2p3y6TaEWTwRh3g/aN25wDmoApwSJOfg4StvjUMvUixPMwZRZ nTGS28vNNZ+G3Qupqgq8ZB6Zuaka3uIR9La6kSHGVLBLMGo3+IwTlCp/8btKk75m ddaspDKQWJfpG9dJt2AXtK7Ttk+dHrrTvTqP0THeKODL4h1/1kHqBa85FsjWFsTg dIDJQhtmjfRLe4EmMc0UXxQ6jC4EBt3fUv8pUh2Ny+1Mvc4+BdHj/RP74OiSz/1B BEHi1fLOSyFTYgsv+TANrnJv/Y2TviSq+dpSLaKH2GZ6xw9A5GFMQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (ti0005a400-0034.bb.online.no [88.91.194.35]) by mail.messagingengine.com (Postfix) with ESMTPA id F3B22E4434 for ; Sun, 24 Jun 2018 16:11:43 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT. Date: Sun, 24 Jun 2018 22:11:41 +0200 Message-Id: <20180624201141.29124-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.4 (-----) * gnu/bootloader/grub.scm (install-grub-efi): When MOUNT-POINT/EFI-DIR exists, install there rather than EFI-DIR directly. --- gnu/bootloader/grub.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index a131f3b50..8371888fa 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -387,12 +387,17 @@ submenu \"GNU system, old configurations...\" {~%") ;; Install GRUB onto the EFI partition mounted at EFI-DIR, for the ;; system whose root is mounted at MOUNT-POINT. (let ((grub-install (string-append bootloader "/sbin/grub-install")) - (install-dir (string-append mount-point "/boot"))) + (install-dir (string-append mount-point "/boot")) + ;; When installing GuixSD, it's common to mount EFI-DIR below + ;; MOUNT-POINT rather than /boot/efi on the live image. + (target-esp (if (file-exists? (string-append mount-point efi-dir)) + (string-append mount-point efi-dir) + efi-dir))) ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") (unless (zero? (system* grub-install "--boot-directory" install-dir - "--efi-directory" efi-dir)) + "--efi-directory" target-esp)) (error "failed to install GRUB (EFI)"))))) -- 2.18.0 ------------=_1586266622-13468-1--