diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-11 23:30:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-11 23:30:32 +0200 |
| commit | 9b043df7403a10b35b93d133aac796fd277a7339 (patch) | |
| tree | f712922d9348ececc0d84e360ac653df3b8d2473 /gnu/installer/final.scm | |
| parent | d79ec4fd343bc2a72652aa3a4b4ae14bd8df88ac (diff) | |
| parent | 648ae62112f62bc2106fb36d45c83fda787d3bed (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer/final.scm')
| -rw-r--r-- | gnu/installer/final.scm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index ece1aff95c..e06b104d59 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -127,7 +127,7 @@ USERS." (lambda (port) (match (string-tokenize (read-string port) %not-nul) ((argv0 _ ...) - (unless (member (pk (basename argv0)) spare) + (unless (member (basename argv0) spare) (syslog "Killing process ~a (~a)~%" pid argv0) (kill pid SIGKILL))) (_ #f)))))) @@ -205,7 +205,18 @@ or #f. Return #t on success and #f on failure." (lambda () (start-service 'cow-store (list (%installer-target-dir)))) (lambda () - (run-command install-command #:locale locale)) + ;; If there are any connected clients, assume that we are running + ;; installation tests. In that case, dump the standard and error + ;; outputs to syslog. + (if (not (null? (current-clients))) + (with-output-to-file "/dev/console" + (lambda () + (with-error-to-file "/dev/console" + (lambda () + (setvbuf (current-output-port) 'none) + (setvbuf (current-error-port) 'none) + (run-command install-command #:locale locale))))) + (run-command install-command #:locale locale))) (lambda () (stop-service 'cow-store) ;; Remove the store overlay created at cow-store service start. |