134/197: installer: Tolerate an undefined system role in config generation.

[Danny Milosavljevic]

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)))