[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/26: installer: Properly handle swap partitions when generating the co
From: |
John Darrington |
Subject: |
02/26: installer: Properly handle swap partitions when generating the configuration. |
Date: |
Sun, 22 Jan 2017 12:09:24 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit f1cce0a9549cfb0ef1bf68931a5d50dd134a126b
Author: John Darrington <address@hidden>
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)
- branch wip-installer updated (613ab98 -> 61c0ffb), John Darrington, 2017/01/22
- 02/26: installer: Properly handle swap partitions when generating the configuration.,
John Darrington <=
- 07/26: gurses: Change highlighting from bold to inverse., John Darrington, 2017/01/22
- 04/26: installer: Do not add file systems which are invalid., John Darrington, 2017/01/22
- 10/26: installer: Check that swap spaces have not been assigned mount points, John Darrington, 2017/01/22
- 14/26: installer: Distinguish between Wifi encryption methods., John Darrington, 2017/01/22
- 01/26: installer: Extend the 'file-system' concept to include swap spaces., John Darrington, 2017/01/22
- 21/26: installer: Do not assume the root file system is of type "ext4"., John Darrington, 2017/01/22
- 17/26: installer: Note which types of file system are supported., John Darrington, 2017/01/22
- 25/26: installer: Emphasise that writing filesystems destroys existing data., John Darrington, 2017/01/22
- 05/26: installer: Fix bug where the selected item of main page was not indicated., John Darrington, 2017/01/22
- 08/26: gurses: form: Use match instead of car, cdr etc., John Darrington, 2017/01/22