[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
134/197: installer: Tolerate an undefined system role in config generati
From: |
Danny Milosavljevic |
Subject: |
134/197: installer: Tolerate an undefined system role in config generation. |
Date: |
Mon, 3 Jul 2017 20:37:13 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 9c84ea607e8cf412f8141d15a2c462ba6be3426f
Author: John Darrington <address@hidden>
Date: Sun Jan 22 21:09:35 2017 +0100
installer: Tolerate an undefined system role in config generation.
* gnu/system/installer/configure.scm (generate-guix-config): Don't crash if
the
system-role is undefined.
---
gnu/system/installer/configure.scm | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/gnu/system/installer/configure.scm
b/gnu/system/installer/configure.scm
index 2980f4b..86eddd2 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -145,15 +145,17 @@
p #:width width)
(newline p)
- (pretty-print
- `(use-service-modules
- ,@(role-service-modules system-role)) p #:width width)
- (newline p)
-
- (pretty-print
- `(use-package-modules
- ,@(role-package-modules system-role)) p #:width width)
- (newline p)
+ (when system-role
+ (pretty-print
+ `(use-service-modules
+ ,@(role-service-modules system-role)) p #:width width)
+ (newline p))
+
+ (when system-role
+ (pretty-print
+ `(use-package-modules
+ ,@(role-package-modules system-role)) p #:width width)
+ (newline p))
(pretty-print
`(operating-system
@@ -193,14 +195,17 @@
mount-points)))
(users (cons* %base-user-accounts))
(packages (cons*
- ,@(role-packages system-role)
+ ,@(if system-role
+ (role-packages system-role)
+ '())
%base-packages))
(services (cons*
,@(if key-map
`((console-keymap-service ,key-map))
`())
- ,@(role-services system-role)
- ))
+ ,@(if system-role
+ (role-services system-role)
+ '())))
(name-service-switch %mdns-host-lookup-nss)) p #:width width)))
- 142/197: gurses: xchar->char: New procedure., (continued)
- 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, 2017/07/03
- 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 <=
- 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
- 150/197: gurses: Reimplement pad-complex-string., Danny Milosavljevic, 2017/07/03
- 159/197: installer: Fix i18n in dialogs., Danny Milosavljevic, 2017/07/03
- 154/197: installer: Main page: Redisplay translatable strings upon refresh., Danny Milosavljevic, 2017/07/03
- 157/197: installer: Replace 'file-browser' with 'key-map'., Danny Milosavljevic, 2017/07/03
- 161/197: installer: Improve i18n in ping page., Danny Milosavljevic, 2017/07/03