summaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-04-28 23:40:24 +0200
committerLudovic Courtès <ludo@gnu.org>2014-04-28 23:41:08 +0200
commitf6a7b21df7b499e8d304cc96fc949ec889e1eb10 (patch)
tree3647f46b807cc1ba719f6490ee803c6fbdb005e2 /gnu/system.scm
parent23f6056b5022ae5051491a3ccecd2fea01105087 (diff)
system: grub: Rewrite using gexps.
* gnu/system/grub.scm (grub-configuration-file): Rewrite using 'gexp->derivation'. * gnu/system.scm (operating-system-derivation): Adjust accordingly.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm15
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index b52daf7917..0b2501392d 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -282,26 +282,25 @@ we're running in the final root."
((profile (operating-system-profile os))
(etc (operating-system-etc-directory os))
(services (sequence %store-monad (operating-system-services os)))
- (boot-drv (operating-system-boot-script os))
- (boot -> (derivation->output-path boot-drv))
+ (boot (operating-system-boot-script os))
(kernel -> (operating-system-kernel os))
(initrd (operating-system-initrd os))
- (initrd-file -> (string-append (derivation->output-path initrd)
- "/initrd"))
+ (initrd-file -> #~(string-append #$initrd "/initrd"))
(entries -> (list (menu-entry
(label (string-append
"GNU system with "
(package-full-name kernel)
" (technology preview)"))
(linux kernel)
- (linux-arguments `("--root=/dev/sda1"
- ,(string-append "--load=" boot)))
+ (linux-arguments
+ (list "--root=/dev/sda1"
+ #~(string-append "--load=" #$boot)))
(initrd initrd-file))))
(grub.cfg (grub-configuration-file entries)))
(file-union "system"
- `(("boot" ,#~#$boot-drv)
+ `(("boot" ,#~#$boot)
("kernel" ,#~#$kernel)
- ("initrd" ,#~(string-append #$initrd "/initrd"))
+ ("initrd" ,initrd-file)
("profile" ,#~#$profile)
("grub.cfg" ,#~#$grub.cfg)
("etc" ,#~#$etc)))))