diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
| commit | b2bfa32d253337a48f3bc0260982cbb945b345a3 (patch) | |
| tree | a75ae018b5c7608414bf50bd6e55683eb0c44f7a /gnu/system/grub.scm | |
| parent | 99662b8dbf420d0112f83b7daddcecfb1bcb9bad (diff) | |
| parent | 2096ef47aad57a9988c8fdfaa46a70770a0e0b12 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to 'gnu/system/grub.scm')
| -rw-r--r-- | gnu/system/grub.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index 86fa9b504d..5dc0b85ff2 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +41,7 @@ (linux menu-entry-linux) (linux-arguments menu-entry-linux-arguments (default '())) - (initrd menu-entry-initrd)) + (initrd menu-entry-initrd)) ; file name of the initrd (define* (grub-configuration-file entries #:key (default-entry 1) (timeout 5) @@ -66,10 +66,7 @@ search.file ~a~%" (match-lambda (($ <menu-entry> label linux arguments initrd) (mlet %store-monad ((linux (package-file linux "bzImage" - #:system system)) - (initrd (package-file initrd "initrd" #:system system))) - ;; XXX: Assume that INITRD is a directory containing an 'initrd' file. (return (format #f "menuentry ~s { linux ~a ~a initrd ~a |