diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-12-09 21:32:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-12-10 00:24:02 +0100 |
| commit | 033adfe7e0ed37f42098772549414a1dc797605c (patch) | |
| tree | 45f9f9a50dc3af97f8b5b0a4c4a51303cc28a047 /gnu/system/grub.scm | |
| parent | 593c3fe600a5f5e90a6eea3a175f83d3319b4efe (diff) | |
| download | gnu-guix-033adfe7e0ed37f42098772549414a1dc797605c.tar gnu-guix-033adfe7e0ed37f42098772549414a1dc797605c.tar.gz | |
gnu: Add (gnu system).
* gnu/system/vm.scm (lower-inputs): Move to monads.scm.
(qemu-image): Don't add GRUB-CONFIGURATION to the INPUTS-TO-COPY.
(union, file-union, etc-directory): Move to gnu/system.scm.
(%demo-operating-system): New variable.
(system-qemu-image): Add 'os' parameter. Rewrite in terms of
'operating-system-derivation'.
* guix/monads.scm (lower-inputs): New procedure.
* gnu/system/grub.scm (grub-configuration-file): Change 'entries' to be
a plain list instead of a list of monadic values.
* gnu/system.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
Diffstat (limited to 'gnu/system/grub.scm')
| -rw-r--r-- | gnu/system/grub.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index abc220b532..86fa9b504d 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -56,12 +56,11 @@ search.file ~a~%" default-entry timeout kernel)) (define (bzImage) - (anym %store-monad - (match-lambda - (($ <menu-entry> _ linux) - (package-file linux "bzImage" - #:system system))) - entries)) + (any (match-lambda + (($ <menu-entry> _ linux) + (package-file linux "bzImage" + #:system system))) + entries)) (define entry->text (match-lambda @@ -79,7 +78,8 @@ search.file ~a~%" linux (string-join arguments) initrd)))))) (mlet %store-monad ((kernel (bzImage)) - (body (mapm %store-monad entry->text entries))) + (body (sequence %store-monad + (map entry->text entries)))) (text-file "grub.cfg" (string-append (prologue kernel) (string-concatenate body))))) |