@@ -3,6 +3,7 @@
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -90,6 +91,25 @@ (define (run-other-services-cbt-page)
(condition
(&installer-step-abort)))))))
+(define (run-system-administration-cbt-page)
+ "Run a page to select various system adminstration services."
+ (let ((items (filter (lambda (service)
+ (eq? 'administration
+ (system-service-type service)))
+ %system-services)))
+ (run-checkbox-tree-page
+ #:title (G_ "Miscellaneous services")
+ #:info-text (G_ "Select miscellaneous services to run on your system.")
+ #:items items
+ #:selection (map system-service-recommended? items)
+ #:item->text (compose G_ system-service-name)
+ #:checkbox-tree-height 5
+ #:exit-button-callback-procedure
+ (lambda ()
+ (raise
+ (condition
+ (&installer-step-abort)))))))
+
(define (run-network-management-page)
"Run a page to select among several network management methods."
(let ((title (G_ "Network management")))
@@ -121,6 +141,7 @@ (define (run-services-page)
(append desktop
(run-networking-cbt-page)
(if (null? desktop)
- (list (run-network-management-page))
+ (cons (run-network-management-page)
+ (run-system-administration-cbt-page))
'())
(run-other-services-cbt-page))))
@@ -3,6 +3,7 @@
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -104,6 +105,13 @@ (define %system-services
(packages '((specification->package "nss-certs")))
(recommended? #t))
+ ;; Miscellaneous system administration services.
+ (system-service
+ (name (G_ "Network time service (NTP), to set the clock automatically"))
+ (type 'administration)
+ (recommended? #t)
+ (snippet '((service ntp-service-type))))
+
;; Network connectivity management.
(system-service
(name (G_ "NetworkManager network connection manager"))
@@ -221,7 +221,11 @@ (define* (choose-services port
(choose-network-management-tool?
(lambda (service)
(string-contains service "DHCP")))
- (choose-other-service? (const #f)))
+ (choose-other-service? (const #f))
+ (choose-misc-service?
+ (lambda (service)
+ (string-contains service "NTP"))))
+
"Converse over PORT to choose services."
(define desktop-environments '())
@@ -243,6 +247,10 @@ (define desktop-environments '())
(null? desktop-environments)
(find choose-network-management-tool? services))
+ ((checkbox-list (title "Miscellaneous services") (text _)
+ (items ,services))
+ (filter choose-misc-service? services))
+
((checkbox-list (title "Other services") (text _)
(items ,services))
(filter choose-other-service? services))))
@@ -1685,8 +1685,9 @@ (define* (installation-target-os-for-gui-tests
(list
(swap-space
(target (uuid "11111111-2222-3333-4444-123456789abc"))))))
- (services (cons (service dhcp-client-service-type)
- (operating-system-user-services %minimal-os-on-vda)))))
+ (services (cons* (service dhcp-client-service-type)
+ (service ntp-service-type)
+ (operating-system-user-services %minimal-os-on-vda)))))
(define* (installation-target-desktop-os-for-gui-tests
#:key (encrypted? #f))