[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: guix system: Mention 'herd restart' when reconfigure completes.
From: |
guix-commits |
Subject: |
04/04: guix system: Mention 'herd restart' when reconfigure completes. |
Date: |
Fri, 3 Apr 2020 06:58:25 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 73bfb14f8ff105bbc8a8836f475f72867297fe93
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Apr 3 11:42:01 2020 +0200
guix system: Mention 'herd restart' when reconfigure completes.
* guix/scripts/system.scm (with-shepherd-error-handling): Use 'mbegin'
instead of 'begin'.
(perform-action): Print a message after 'upgrade-shepherd-services'.
That message had disappeared in commit
5c8c8c455420af27189d6045b3599fe6e27ad012.
---
guix/scripts/system.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index b87f2bd..2664c66 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -258,7 +258,7 @@ expression in %STORE-MONAD."
(lambda ()
(guard (c ((shepherd-error? c)
(values (report-shepherd-error c) store)))
- (values (run-with-store store (begin mbody ...))
+ (values (run-with-store store (mbegin %store-monad mbody ...))
store)))
(lambda (key proc format-string format-args errno . rest)
(warning (G_ "while talking to shepherd: ~a~%")
@@ -837,7 +837,10 @@ static checks."
(info (G_ "bootloader successfully installed on '~a'~%")
(bootloader-configuration-target bootloader))))
(with-shepherd-error-handling
- (upgrade-shepherd-services local-eval os))))
+ (upgrade-shepherd-services local-eval os)
+ (return (format #t (G_ "\
+To complete the upgrade, run 'herd restart SERVICE' to stop,
+upgrade, and restart each service that was not automatically
restarted.\n"))))))
((init)
(newline)
(format #t (G_ "initializing operating system under '~a'...~%")