ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Emit 'bootloader' field before 'swap-devices'.

Browse source 
* gnu/installer/parted.scm (user-partitions->configuration): Move
'bootloader' section above 'swap-devices'.
This commit is contained in:
Ludovic Courtès 2019-03-26 21:58:41 +01:00
parent 37099f5844
commit 54043bf23f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/installer/parted.scm
View file

@ -1270,10 +1270,10 @@ (define (user-partitions->configuration user-partitions)
(swap-devices (map user-partition-file-name swap-user-partitions)) (swap-devices (map user-partition-file-name swap-user-partitions))
(encrypted-partitions (encrypted-partitions
(filter user-partition-crypt-label user-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)))) `((swap-devices (list ,@swap-devices))))
(bootloader ,@(bootloader-configuration user-partitions))
,@(if (null? encrypted-partitions) ,@(if (null? encrypted-partitions)
'() '()
`((mapped-devices `((mapped-devices