[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: installer: Emit 'bootloader' field before 'swap-devices'.
From: |
guix-commits |
Subject: |
01/08: installer: Emit 'bootloader' field before 'swap-devices'. |
Date: |
Wed, 27 Mar 2019 06:54:17 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 54043bf23f9b1a012f26082f57286862c5029865
Author: Ludovic Courtès <address@hidden>
Date: Tue Mar 26 21:58:41 2019 +0100
installer: Emit 'bootloader' field before 'swap-devices'.
* gnu/installer/parted.scm (user-partitions->configuration): Move
'bootloader' section above 'swap-devices'.
---
gnu/installer/parted.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 24d048c..b9eaa79 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
- branch master updated (37099f5 -> 9e5f206), guix-commits, 2019/03/27
- 01/08: installer: Emit 'bootloader' field before 'swap-devices'.,
guix-commits <=
- 04/08: installer: Use the (service …) form for MATE., guix-commits, 2019/03/27
- 08/08: scripts: Skip 'guix pull' suggestion when running code from a checkout., guix-commits, 2019/03/27
- 02/08: installer: Produce an 'initrd-modules' field if needed., guix-commits, 2019/03/27
- 03/08: installer: Ask for confirmation before formatting partitions., guix-commits, 2019/03/27
- 07/08: vm: Ask QEMU for more RAM in the VM that makes ISO9660 images., guix-commits, 2019/03/27
- 05/08: services: Deprecate 'gnome-desktop-service'., guix-commits, 2019/03/27
- 06/08: services: Deprecate 'xfce-desktop-service'., guix-commits, 2019/03/27