diff options
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/final.scm | 13 | ||||
| -rw-r--r-- | gnu/installer/tests.scm | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 3c170e5d0f..4c2da484c9 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -111,12 +111,13 @@ USERS." (let ((pids (filter-map (lambda (pid) - (call-with-input-file - (string-append "/proc/" pid "/maps") - (lambda (port) - (and (string-contains (get-string-all port) - cow-path) - (string->number pid))))) + (false-if-exception + (call-with-input-file + (string-append "/proc/" pid "/maps") + (lambda (port) + (and (string-contains (get-string-all port) + cow-path) + (string->number pid)))))) (scandir "/proc" string->number)))) (for-each (lambda (pid) ;; cmdline does not always exist. diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm index 6f5393e3ab..8ae80e4d7e 100644 --- a/gnu/installer/tests.scm +++ b/gnu/installer/tests.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -211,7 +212,7 @@ ROOT-PASSWORD, and USERS." (define* (choose-services port #:key - (desktop-environments '("GNOME")) + (choose-desktop-environment? (const #f)) (choose-network-service? (lambda (service) (or (string-contains service "SSH") @@ -220,10 +221,14 @@ ROOT-PASSWORD, and USERS." (lambda (service) (string-contains service "DHCP")))) "Converse over PORT to choose networking services." + (define desktop-environments '()) + (converse port ((checkbox-list (title "Desktop environment") (text _) - (items _)) - desktop-environments) + (items ,services)) + (let ((desktops (filter choose-desktop-environment? services))) + (set! desktop-environments desktops) + desktops)) ((checkbox-list (title "Network service") (text _) (items ,services)) (filter choose-network-service? services)) |