diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
| commit | 9e111db4535b3cd5729e37294ae51d95240334b4 (patch) | |
| tree | cc90a9de80ff39bd93426b763918d904abfeeb56 /tests/guix-system.sh | |
| parent | 92b61d3e1bb50f0c1d087bc8d57cc00c3ce360df (diff) | |
| parent | cf69135d5e6797e566b8bb18419ae9e3c8aeb621 (diff) | |
| download | guix-9e111db4535b3cd5729e37294ae51d95240334b4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/guix-system.sh')
| -rw-r--r-- | tests/guix-system.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 213864833a..ed8563c8aa 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> # # This file is part of GNU Guix. # @@ -134,7 +135,9 @@ OS_BASE=' (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title (string->symbol "label")) @@ -205,7 +208,9 @@ make_user_config () (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title 'label) |