From 5475749960d44163a4c6c4d1d1cb1be9872b861e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Nov 2017 09:58:33 +0100 Subject: system: Do not set 'TZ'. Fixes . Reported by Diego Nicola Barbato . * gnu/system.scm (operating-system-environment-variables): Remove "TZ". --- gnu/system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/system.scm') diff --git a/gnu/system.scm b/gnu/system.scm index 5f562b48bb..ce2c05f4e1 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -727,7 +727,8 @@ (define (operating-system-environment-variables os) "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 . ("TZDIR" . ,(file-append tzdata "/share/zoneinfo")) ;; Tell 'modprobe' & co. where to look for modules. ("LINUX_MODULE_DIRECTORY" . "/run/booted-system/kernel/lib/modules") -- cgit v1.2.3 From a0fea77dbb028c11f1d47813617ce45e38c9e233 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Nov 2017 11:34:51 +0100 Subject: services: guix: Remove dependency on 'lsof'. This is a followup to b8f59cdc20e9d83ce63523ef917e95fcee07f134: 'list-runtime-roots' no longer depends on 'lsof'. * gnu/services/base.scm ()[lsof]: Remove. (guix-shepherd-service): Adjust accordingly. * doc/guix.texi (Base Services): Adjust accordingly. * gnu/system.scm (%base-packages): Remove LSOF. --- doc/guix.texi | 3 --- gnu/services/base.scm | 10 ++-------- gnu/system.scm | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/system.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 0bc2be1fd1..098ff5e543 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9830,9 +9830,6 @@ List of extra command-line options for @command{guix-daemon}. File where @command{guix-daemon}'s standard output and standard error are written. -@item @code{lsof} (default: @var{lsof}) -The lsof package to use. - @item @code{http-proxy} (default: @code{#f}) The HTTP proxy used for downloading fixed-output derivations and substitutes. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 2ba655d940..06b2a7d2d8 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -42,7 +42,6 @@ (define-module (gnu services base) #:use-module (gnu packages bash) #:use-module (gnu packages package-management) #:use-module (gnu packages linux) - #:use-module (gnu packages lsof) #:use-module (gnu packages terminals) #:use-module ((gnu build file-systems) #:select (mount-flags->bit-mask)) @@ -119,7 +118,6 @@ (define-module (gnu services base) guix-configuration-substitute-urls guix-configuration-extra-options guix-configuration-log-file - guix-configuration-lsof guix-service guix-service-type @@ -1374,8 +1372,6 @@ (define-record-type* (default '())) (log-file guix-configuration-log-file ;string (default "/var/log/guix-daemon.log")) - (lsof guix-configuration-lsof ; - (default lsof)) (http-proxy guix-http-proxy ;string | #f (default #f)) (tmpdir guix-tmpdir ;string | #f @@ -1392,7 +1388,7 @@ (define (guix-shepherd-service config) use-substitutes? substitute-urls max-silent-time timeout extra-options - log-file lsof http-proxy tmpdir) + log-file http-proxy tmpdir) (list (shepherd-service (documentation "Run the Guix daemon.") (provision '(guix-daemon)) @@ -1409,10 +1405,8 @@ (define (guix-shepherd-service config) "--substitute-urls" #$(string-join substitute-urls) #$@extra-options) - ;; Add 'lsof' (for the GC) to the daemon's $PATH. #:environment-variables - (list (string-append "PATH=" #$lsof "/bin") - #$@(if http-proxy + (list #$@(if http-proxy (list (string-append "http_proxy=" http-proxy)) '()) #$@(if tmpdir diff --git a/gnu/system.scm b/gnu/system.scm index ce2c05f4e1..9e05c4b213 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -39,7 +39,6 @@ (define-module (gnu system) #: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 @@ (define %base-packages ;; 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' -- cgit v1.2.3