[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
106/197: installer: Properly handle swap partitions when generating the
From: |
Danny Milosavljevic |
Subject: |
106/197: installer: Properly handle swap partitions when generating the configuration. |
Date: |
Mon, 3 Jul 2017 20:37:08 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit e2d834de3feb1262b19ab673f9a3e4a7ddec874f
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)
- 197/197: installer: Use "G_" instead of "_"., (continued)
- 197/197: installer: Use "G_" instead of "_"., Danny Milosavljevic, 2017/07/03
- 188/197: installer: Go back to main menu after "cancel", Danny Milosavljevic, 2017/07/03
- 184/197: installer: Create dedicated module to maintainer the page stack., Danny Milosavljevic, 2017/07/03
- 126/197: installer: mount-points page: Enlarge the forms window., Danny Milosavljevic, 2017/07/03
- 96/197: installer: Changed N_ to M_ since N_ is used for another purpose in guix/ui.scm, Danny Milosavljevic, 2017/07/03
- 142/197: gurses: xchar->char: New procedure., Danny Milosavljevic, 2017/07/03
- 85/197: installer: Use "lspci -mm" instead of "lspci -m"., Danny Milosavljevic, 2017/07/03
- 88/197: installer: Use a cleaner method of detecting wireless capability for ethernet interfaces., Danny Milosavljevic, 2017/07/03
- 93/197: installer: Add a dedicated make to format filesystems., Danny Milosavljevic, 2017/07/03
- 100/197: installer: Do not perform tasks more than once., Danny Milosavljevic, 2017/07/03
- 106/197: installer: Properly handle swap partitions when generating the configuration.,
Danny Milosavljevic <=
- 114/197: installer: Check that swap spaces have not been assigned mount points, Danny Milosavljevic, 2017/07/03
- 112/197: gurses: form: Use match instead of car, cdr etc., Danny Milosavljevic, 2017/07/03
- 125/197: installer: Do not assume the root file system is of type "ext4"., Danny Milosavljevic, 2017/07/03
- 130/197: installer: Delete unused procedure "justify"., Danny Milosavljevic, 2017/07/03
- 134/197: installer: Tolerate an undefined system role in config generation., Danny Milosavljevic, 2017/07/03
- 137/197: installer: Prepare for new wireless network features., Danny Milosavljevic, 2017/07/03
- 140/197: installer: Fix the key map option., Danny Milosavljevic, 2017/07/03
- 132/197: installer: Add new procedure to check file system specifications., Danny Milosavljevic, 2017/07/03
- 145/197: gurses: Avoid yet another use of car and cdr., Danny Milosavljevic, 2017/07/03
- 129/197: installer: Emphasise that writing filesystems destroys existing data., Danny Milosavljevic, 2017/07/03