dannym pushed a commit to branch wip-installer-2
in repository guix.
commit e2d834de3feb1262b19ab673f9a3e4a7ddec874f
Author: John Darrington <[email protected]>
Date: Mon Jan 16 20:51:08 2017 +0100
installer: Properly handle swap partitions when generating the
configuration.
* gnu/system/installer/configure.scm (generate-guix-config): Deal properly
with
swap devices.
---
gnu/system/installer/configure.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/system/installer/configure.scm
b/gnu/system/installer/configure.scm
index 061d97c..6f4d377 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -178,8 +178,19 @@
(device ,(file-system-spec-label fss))
(title 'label)
(mount-point ,(file-system-spec-mount-point fss))
- (type ,(file-system-spec-type fss)))))
mount-points)
+ (type ,(file-system-spec-type fss)))))
+ (filter (lambda (x)
+ (let ((fss (cdr x)))
+ (not (eq? 'swap (file-system-spec-type
fss)))))
+ mount-points))
(list '%base-file-systems)))
+ (swap-devices '
+ ,(map (lambda (x)
+ (car x))
+ (filter (lambda (x)
+ (let ((fss (cdr x)))
+ (eq? 'swap (file-system-spec-type fss))))
+ mount-points)))
(users (cons* %base-user-accounts))
(packages (cons*
,@(role-packages system-role)
