aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-05-18 21:58:01 +0200
committerLudovic Courtès <ludo@gnu.org>2014-05-18 22:27:23 +0200
commitd5b429abda948c21a61032a1da9d472410edaa90 (patch)
tree26387e555d386b9b565644e14acae73434daf47e /build-aux
parent72b9d60df4723541e1a65f7a3d14abb757fbed97 (diff)
downloadguix-d5b429abda948c21a61032a1da9d472410edaa90.tar
guix-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 'build-aux')
-rw-r--r--build-aux/hydra/demo-os.scm3
1 files changed, 3 insertions, 0 deletions
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm
index 32c6fa3abf..fe9c77242e 100644
--- a/build-aux/hydra/demo-os.scm
+++ b/build-aux/hydra/demo-os.scm
@@ -33,6 +33,7 @@
(gnu packages tor)
(gnu packages package-management)
+ (gnu system grub) ; 'grub-configuration'
(gnu system shadow) ; 'user-account'
(gnu system linux) ; 'base-pam-services'
(gnu services base)
@@ -43,6 +44,8 @@
(host-name "gnu")
(timezone "Europe/Paris")
(locale "en_US.UTF-8")
+ (bootloader (grub-configuration
+ (device "/dev/sda")))
(file-systems
;; We provide a dummy file system for /, but that's OK because the VM build
;; code will automatically declare the / file system for us.