diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-03 11:42:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-03 12:58:14 +0200 |
| commit | 73bfb14f8ff105bbc8a8836f475f72867297fe93 (patch) | |
| tree | ab6c1ece878c89a1e9bae54b5824f3fd58628e9a | |
| parent | 4efbb079b5aac6a4eb53ef3f9a67a2849c3ebf1f (diff) | |
| download | guix-73bfb14f8ff105bbc8a8836f475f72867297fe93.tar guix-73bfb14f8ff105bbc8a8836f475f72867297fe93.tar.gz | |
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.
| -rw-r--r-- | guix/scripts/system.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index b87f2bdd3b..2664c66a30 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'...~%") |