guix/guix
3
4
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

services: virtual-terminal: Write to "default_utf8" only if necessary.

Browse source 
Fixes a bug in containers whereby 'virtual-terminal' would always fail
to start because writing to /sys/…/default_utf8 would fail with EROFS.

* gnu/services/base.scm (virtual-terminal-service-type): Read from
"default_utf8" before attempting to write to it.
This commit is contained in:
Ludovic Courtès 2018-09-26 23:01:33 +02:00
parent 23784f0c33
commit 09b7300c01
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/services/base.scm
View file

@ -685,17 +685,20 @@ to add @var{device} to the kernel's entropy pool. The service will fail if
(shepherd-service-type
'virtual-terminal
(lambda (utf8?)
(shepherd-service
(documentation "Set virtual terminals in UTF-8 module.")
(provision '(virtual-terminal))
(requirement '(root-file-system))
(start #~(lambda _
(call-with-output-file
"/sys/module/vt/parameters/default_utf8"
(lambda (port)
(display 1 port)))
#t))
(stop #~(const #f))))
(let ((knob "/sys/module/vt/parameters/default_utf8"))
(shepherd-service
(documentation "Set virtual terminals in UTF-8 module.")
(provision '(virtual-terminal))
(requirement '(root-file-system))
(start #~(lambda _
;; In containers /sys is read-only so don't insist on
;; writing to this file.
(unless (= 1 (call-with-input-file #$knob read))
(call-with-output-file #$knob
(lambda (port)
(display 1 port))))
#t))
(stop #~(const #f)))))
#t)) ;default to UTF-8
(define console-keymap-service-type