diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
| commit | 425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c (patch) | |
| tree | 44479010890dd9aaf8bc52cab73f7c241a2fd9ea /gnu/installer | |
| parent | fe9f2d150019b9fc17f08f5a002d7ca932fc3eb0 (diff) | |
| parent | 88dbef3b9868a565da1eba37c9d409cce972becc (diff) | |
| download | guix-425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c.tar guix-425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/final.scm | 6 | ||||
| -rw-r--r-- | gnu/installer/newt/final.scm | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index a742c2a0cd..685aa81d89 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -137,12 +137,6 @@ USERS." "Remove the store overlay and the bind-mount on /tmp created by the cow-store service. This procedure is very fragile and a better approach would be much appreciated." - - ;; Remove when integrated in (gnu services herd). - (define (restart-service name) - (with-shepherd-action name ('restart) result - result)) - (catch #t (lambda () (let ((tmp-dir "/remove")) diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm index 5cb4f6816d..fa8d6fea71 100644 --- a/gnu/installer/newt/final.scm +++ b/gnu/installer/newt/final.scm @@ -25,6 +25,7 @@ #:use-module (gnu installer newt page) #:use-module (gnu installer newt utils) #:use-module (guix i18n) + #:use-module (guix colors) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (ice-9 match) @@ -101,6 +102,13 @@ a specific step, or restart the installer.")) #:key (users '())) (clear-screen) (newt-suspend) + ;; XXX: Force loading 'bold' font files before mouting the + ;; cow-store. Otherwise, if the file is loaded by kmscon after the cow-store + ;; in mounted, it will be necessary to kill kmscon to umount to cow-store. + (display + (colorize-string + (format #f (G_ "Installing Guix System ...~%")) + (color BOLD))) (let ((install-ok? (install-system locale #:users users))) (newt-resume) install-ok?)) |