diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-11-30 18:24:32 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2016-11-30 18:24:32 +0100 |
| commit | 8a7cbc882a75d7f9f1fe960552dea47acf347b0a (patch) | |
| tree | ded8c9116d357b38fd23b8c0cc312863fe68c9b5 /gnu/build/install.scm | |
| parent | 3084a9908434e4e7123d2fd3881c798977abedb9 (diff) | |
| parent | 72f0c5ea3c0272a93436ad3c04a281d1237a9593 (diff) | |
| download | guix-8a7cbc882a75d7f9f1fe960552dea47acf347b0a.tar guix-8a7cbc882a75d7f9f1fe960552dea47acf347b0a.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/install.scm')
| -rw-r--r-- | gnu/build/install.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/build/install.scm b/gnu/build/install.scm index 3d1594e203..5c2b35632d 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -46,6 +46,11 @@ Note that the caller must make sure that GRUB.CFG is registered as a GC root so that the fonts, background images, etc. referred to by GRUB.CFG are not GC'd." (install-grub-config grub.cfg mount-point) + + ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or root + ;; partition. + (setenv "GRUB_ENABLE_CRYPTODISK" "y") + (unless (zero? (system* "grub-install" "--no-floppy" "--boot-directory" (string-append mount-point "/boot") |