summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2021-04-23 14:50:15 -0400
committerGuix Patches Tester <>2021-04-23 23:48:25 +0100
commit2cf83a25e4ef3bff75bf600f5066bf8de49bec57 (patch)
tree4a515979aee4083ce0c1cd175b43ff560c29f081
parent98a7242e174b4105c2505e9019ae10d906a9195f (diff)
downloadguix-patches-2cf83a25e4ef3bff75bf600f5066bf8de49bec57.tar
guix-patches-2cf83a25e4ef3bff75bf600f5066bf8de49bec57.tar.gz
installer: Recommend 'ntp-service-type' for non-graphical systems.series-7714
We had several bug reports with a root cause of "the clock was incorrect" from users who used the installer to install a non-graphical Guix System. * gnu/installer/services.scm (%system-services): Add the ntp-service-type. * gnu/installer/newt/services.scm (run-system-administration-cbt-page): New variable. (run-services-page): Use run-system-administration-cbt-page when not installing a desktop.
-rw-r--r--gnu/installer/newt/services.scm23
-rw-r--r--gnu/installer/services.scm8
2 files changed, 30 insertions, 1 deletions
diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index 74f28e41ba..60c62a52b1 100644
--- a/gnu/installer/newt/services.scm
+++ b/gnu/installer/newt/services.scm
@@ -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.
;;;
@@ -68,6 +69,25 @@ system.")
(condition
(&installer-step-abort)))))))
+(define (run-system-administration-cbt-page)
+ "Run a page to select various system adminstrative 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 system 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")))
@@ -99,5 +119,6 @@ client may be enough for a server.")
(append desktop
(run-networking-cbt-page)
(if (null? desktop)
- (list (run-network-management-page))
+ (list (run-network-management-page)
+ (run-system-administration-cbt-page))
'()))))
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index ec5ea30594..17ff31d2ec 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -104,6 +105,13 @@
(packages '((specification->package "nss-certs")))
(recommended? #t))
+ ;; System administration
+ (system-service
+ (name (G_ "Network time service, to set the clock automatically"))
+ (type 'administration)
+ (snippet '((service ntp-service-type)))
+ (recommended? #t))
+
;; Network connectivity management.
(system-service
(name (G_ "NetworkManager network connection manager"))