diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:01:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:01:00 +0100 |
| commit | 2dd12924cf4a30a96262b6d392fcde58c9f10d4b (patch) | |
| tree | 3f74f5426ff214a02b8f6652f6516979657a7f98 /gnu/system.scm | |
| parent | 259b4f34ba2eaefeafdb7c9f9eb56ee77f16010c (diff) | |
| parent | a93447b89a5b132221072e729d13a3f17391b8c2 (diff) | |
| download | guix-patches-2dd12924cf4a30a96262b6d392fcde58c9f10d4b.tar guix-patches-2dd12924cf4a30a96262b6d392fcde58c9f10d4b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 2ccae364de..e2bd8d55b6 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages less) #:use-module (gnu packages zile) #:use-module (gnu packages nano) - #:use-module (gnu packages lsof) #:use-module (gnu packages gawk) #:use-module (gnu packages man) #:use-module (gnu packages texinfo) @@ -509,7 +508,6 @@ explicitly appear in OS." ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. (cons* procps psmisc which less zile nano - lsof ;for Guix's 'list-runtime-roots' pciutils usbutils util-linux inetutils isc-dhcp (@ (gnu packages admin) shadow) ;for 'passwd' @@ -727,7 +725,8 @@ use 'plain-file' instead~%") "Return the environment variables of OS for @var{session-environment-service-type}, to be used in @file{/etc/environment}." `(("LANG" . ,(operating-system-locale os)) - ("TZ" . ,(operating-system-timezone os)) + ;; Note: No need to set 'TZ' since (1) we provide /etc/localtime, and (2) + ;; it doesn't work for setuid binaries. See <https://bugs.gnu.org/29212>. ("TZDIR" . ,(file-append tzdata "/share/zoneinfo")) ;; Tell 'modprobe' & co. where to look for modules. ("LINUX_MODULE_DIRECTORY" . "/run/booted-system/kernel/lib/modules") |