From 0af94ad52f65a5a62febd203e431f17642f07577 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 27 Oct 2017 12:15:01 +0200 Subject: gnu: service: Update comment. * gnu/services/base.scm (guix-activation): Update comment. --- gnu/services/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/services/base.scm') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b605614ab6..2ba655d940 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1441,7 +1441,7 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) (match config (($ guix build-group build-accounts authorize-key? keys) ;; Assume that the store has BUILD-GROUP as its group. We could - ;; otherwise call 'chown' here, but the problem is that on a COW unionfs, + ;; otherwise call 'chown' here, but the problem is that on a COW overlayfs, ;; chown leads to an entire copy of the tree, which is a bad idea. ;; Optionally authorize hydra.gnu.org's key. -- cgit v1.2.3 From a0fea77dbb028c11f1d47813617ce45e38c9e233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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. --- gnu/services/base.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/services/base.scm') 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 @@ #: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 @@ guix-configuration-substitute-urls guix-configuration-extra-options guix-configuration-log-file - guix-configuration-lsof guix-service guix-service-type @@ -1374,8 +1372,6 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) (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 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) 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 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) "--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 -- cgit v1.2.3