diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 17:37:20 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 17:37:20 +0100 |
| commit | 8c72ed923d77ee55989965bb02628043799b9548 (patch) | |
| tree | 802e6eb910719a98fa09bf7c2bd884097f649adc /gnu/system/install.scm | |
| parent | 189be331acfda1c242a9c85fca8d2a0356742f48 (diff) | |
| parent | aac6cbbfede0bbfafdbbeeb460f00a244333895d (diff) | |
| download | patches-8c72ed923d77ee55989965bb02628043799b9548.tar patches-8c72ed923d77ee55989965bb02628043799b9548.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system/install.scm')
| -rw-r--r-- | gnu/system/install.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index b61660b4b9..97f5abe0b6 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> @@ -133,7 +133,7 @@ the given target.") (stop #~(lambda (target) ;; Delete the temporary directory, but leave everything ;; mounted as there may still be processes using it since - ;; 'user-processes' doesn't depend on us. The 'user-unmount' + ;; 'user-processes' doesn't depend on us. The 'user-file-systems' ;; service will unmount TARGET eventually. (delete-file-recursively (string-append target #$%backing-directory)))))))) @@ -396,10 +396,7 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." (kernel-arguments (cons (string-append "console=" tty) (operating-system-user-kernel-arguments installation-os))) - (initrd (lambda (fs . rest) - (apply base-initrd fs - #:extra-modules extra-modules - rest))))) + (initrd-modules (append extra-modules %base-initrd-modules)))) (define beaglebone-black-installation-os (embedded-installation-os u-boot-beaglebone-black-bootloader |