diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-18 21:58:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-18 22:27:23 +0200 |
| commit | d5b429abda948c21a61032a1da9d472410edaa90 (patch) | |
| tree | 26387e555d386b9b565644e14acae73434daf47e /gnu/system.scm | |
| parent | 72b9d60df4723541e1a65f7a3d14abb757fbed97 (diff) | |
| download | patches-d5b429abda948c21a61032a1da9d472410edaa90.tar patches-d5b429abda948c21a61032a1da9d472410edaa90.tar.gz | |
system: Add 'grub-configuration' record.
* gnu/system/grub.scm (<grub-configuration>): New record type.
(grub-configuration-file): Add 'config' parameter; remove
#:default-entry and #:timeout. Honor CONFIG.
* gnu/system.scm (<operating-system>): Remove 'bootloader-entries'
field; remove default value for 'bootloader' field.
(operating-system-grub.cfg): Pass the 'bootloader' field to
'grub-configuration-file'.
* build-aux/hydra/demo-os.scm (bootloader): New field.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index ec3e2fcd6c..dd44878462 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -39,10 +39,11 @@ #:use-module (srfi srfi-26) #:export (operating-system operating-system? + + operating-system-bootloader operating-system-services operating-system-user-services operating-system-packages - operating-system-bootloader-entries operating-system-host-name operating-system-kernel operating-system-initrd @@ -83,10 +84,8 @@ operating-system? (kernel operating-system-kernel ; package (default linux-libre)) - (bootloader operating-system-bootloader ; package - (default grub)) - (bootloader-entries operating-system-bootloader-entries ; list - (default '())) + (bootloader operating-system-bootloader) ; <grub-configuration> + (initrd operating-system-initrd ; (list fs) -> M derivation (default qemu-initrd)) @@ -504,7 +503,7 @@ we're running in the final root." #~(string-append "--load=" #$system "/boot"))) (initrd #~(string-append #$system "/initrd")))))) - (grub-configuration-file entries))) + (grub-configuration-file (operating-system-bootloader os) entries))) (define (operating-system-derivation os) "Return a derivation that builds OS." |