summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-09-14 11:35:54 +0200
committerLudovic Courtès <ludo@gnu.org>2021-09-14 11:50:59 +0200
commit580984f2417853379d98ea927fd95c0f0fbe2c97 (patch)
treefd12273435c09a5360dc9c253fa8d3b55b1d17b5 /gnu
parent912880c15ec7226d82773991ac833cec4e1985b2 (diff)
system: Add trailing newline to /etc/timezone.
Fixes <https://issues.guix.gnu.org/50523>. Reported by meedstrom@teknik.io. * gnu/system.scm (operating-system-etc-service): Add trailing newline to "timezone" contents.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 98aeda0306..2b919d8b4a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -969,7 +969,12 @@ fi\n")))
;; Some programs (e.g., GLib) look at /etc/timezone to find the
;; name of the current timezone. For details, see
;; https://lists.gnu.org/archive/html/guix-devel/2019-07/msg00166.html
- ("timezone" ,(plain-file "timezone" (operating-system-timezone os)))
+ ;; Some programs expect a terminating newline.
+ ("timezone" ,(plain-file "timezone"
+ (string-append
+ (string-trim-both
+ (operating-system-timezone os))
+ "\n")))
("localtime" ,(file-append tzdata "/share/zoneinfo/"
(operating-system-timezone os)))
,@(if sudoers