aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-26 21:58:41 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-27 11:54:05 +0100
commit54043bf23f9b1a012f26082f57286862c5029865 (patch)
treebe9e1bc198c98cb4eae53cc8a47cb18a9926bb9b /gnu
parent37099f58442419ebd847616ffe21b19c4b655a41 (diff)
downloadgnu-guix-54043bf23f9b1a012f26082f57286862c5029865.tar
gnu-guix-54043bf23f9b1a012f26082f57286862c5029865.tar.gz
installer: Emit 'bootloader' field before 'swap-devices'.
* gnu/installer/parted.scm (user-partitions->configuration): Move 'bootloader' section above 'swap-devices'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/installer/parted.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 24d048c04c..b9eaa79458 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1270,10 +1270,10 @@ from (gnu system mapped-devices) and return it."
(swap-devices (map user-partition-file-name swap-user-partitions))
(encrypted-partitions
(filter user-partition-crypt-label user-partitions)))
- `(,@(if (null? swap-devices)
+ `((bootloader ,@(bootloader-configuration user-partitions))
+ ,@(if (null? swap-devices)
'()
`((swap-devices (list ,@swap-devices))))
- (bootloader ,@(bootloader-configuration user-partitions))
,@(if (null? encrypted-partitions)
'()
`((mapped-devices