futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guix system: Mention 'herd restart' when reconfigure completes.

Browse Source 
* 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
5c8c8c4554.
This commit is contained in:
Ludovic Courtès 2020-04-03 11:42:01 +02:00
parent 4efbb079b5
commit 73bfb14f8f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/system.scm
View File

@ -258,7 +258,7 @@ expression in %STORE-MONAD."
(lambda () (lambda ()
(guard (c ((shepherd-error? c) (guard (c ((shepherd-error? c)
(values (report-shepherd-error c) store))) (values (report-shepherd-error c) store)))
(values (run-with-store store (begin mbody ...)) (values (run-with-store store (mbegin %store-monad mbody ...))
store))) store)))
(lambda (key proc format-string format-args errno . rest) (lambda (key proc format-string format-args errno . rest)
(warning (G_ "while talking to shepherd: ~a~%") (warning (G_ "while talking to shepherd: ~a~%")
@ -837,7 +837,10 @@ static checks."
(info (G_ "bootloader successfully installed on '~a'~%") (info (G_ "bootloader successfully installed on '~a'~%")
(bootloader-configuration-target bootloader)))) (bootloader-configuration-target bootloader))))
(with-shepherd-error-handling (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) ((init)
(newline) (newline)
(format #t (G_ "initializing operating system under '~a'...~%") (format #t (G_ "initializing operating system under '~a'...~%")