diff options
author | Leo Famulari <leo@famulari.name> | 2016-11-23 22:24:52 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-11-23 22:24:52 -0500 |
commit | 2ac7d54616819c65405ea27260dbff462160f290 (patch) | |
tree | 4c82001f0855ebab05ab342e342a680c533b9bf9 /gnu/packages/grub.scm | |
parent | 61320932edb42e78fb377b5d11cd6ecb32e2f9e6 (diff) | |
parent | 1c9f78eca1f7e169562abaaa882fd94d845208af (diff) | |
download | guix-2ac7d54616819c65405ea27260dbff462160f290.tar guix-2ac7d54616819c65405ea27260dbff462160f290.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/grub.scm')
-rw-r--r-- | gnu/packages/grub.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index b920be9ea2..ef7395e95e 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -127,9 +127,16 @@ (("set -e") "exit 77\nset -e")) #t))))) (inputs - `(;; ("lvm2" ,lvm2) - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) + + ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and + ;; 'grub-install' to recognize mapped devices (LUKS, etc.) + ("lvm2" ,lvm2) + + ;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install' + ;; to determine whether the root file system is RAID. ("mdadm" ,mdadm) + ("freetype" ,freetype) ;; ("libusb" ,libusb) ;; ("fuse" ,fuse) |