diff options
| author | Marius Bakke <[email protected]> | 2020-11-11 00:02:32 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-11-11 00:02:32 +0100 |
| commit | a9a0d348743af1a25fd27b2b073f0fe2b46978b6 (patch) | |
| tree | a398c8229d516c99e3e1f4a527939b583ba1f5bb /gnu/packages/bootloaders.scm | |
| parent | 3dee2299aefaf954ce38073a8dc385ab21b559c2 (diff) | |
| parent | 569cd538667dd8a0d0eacab2b326777c197260b8 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7034085d67..e3e49288ad 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email protected]> ;;; Copyright © 2016, 2017 Danny Milosavljevic <[email protected]> ;;; Copyright © 2016, 2017 David Craven <[email protected]> -;;; Copyright © 2017, 2018 Efraim Flashner <[email protected]> +;;; Copyright © 2017, 2018, 2020 Efraim Flashner <[email protected]> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2019 nee <[email protected]> ;;; Copyright © 2019 Mathieu Othacehe <[email protected]> @@ -115,11 +115,12 @@ ;; determine the root file system when it's a RAID ;; device. Failing to do that, 'grub-probe' silently ;; fails if 'mdadm' is not in $PATH. - (substitute* "grub-core/osdep/linux/getroot.c" - (("argv\\[0\\] = \"mdadm\"") - (string-append "argv[0] = \"" - (assoc-ref inputs "mdadm") - "/sbin/mdadm\""))) + (when (assoc-ref inputs "mdadm") + (substitute* "grub-core/osdep/linux/getroot.c" + (("argv\\[0\\] = \"mdadm\"") + (string-append "argv[0] = \"" + (assoc-ref inputs "mdadm") + "/sbin/mdadm\"")))) ;; Make the font visible. (copy-file (assoc-ref (or native-inputs inputs) |