diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-03 21:36:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 11:49:24 +0200 |
| commit | 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d (patch) | |
| tree | ee72b469abb0463ac9ed60258419f028c06f15c6 /config-daemon.ac | |
| parent | 7fcc2f93552bfb6ebb96cb9e1b47876a92fb0173 (diff) | |
| download | guix-2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.tar guix-2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.tar.gz | |
daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'.
* nix/scripts/list-runtime-roots.in: Remove.
* guix/store/roots.scm (%proc-directory): New variable.
(proc-file-roots, proc-exe-roots, proc-cwd-roots)
(proc-fd-roots, proc-maps-roots, proc-environ-roots)
(referenced-files, canonicalize-store-item, busy-store-items): New
procedures, taken from 'list-runtime-roots.in'.
* nix/libstore/globals.hh (Settings)[guixProgram]: New field.
* nix/libstore/globals.cc (Settings::processEnvironment): Initialize
'guixProgram'.
* nix/libstore/gc.cc (addAdditionalRoots): Drop code related to
'NIX_ROOT_FINDER'. Run "guix gc --list-busy".
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove
'scripts/list-runtime-roots'.
* config-daemon.ac: Don't output nix/scripts/list-runtime-roots.
* build-aux/pre-inst-env.in: Don't set 'NIX_ROOT_FINDER'.
Set 'GUIX'.
* doc/guix.texi (Invoking guix gc): Document '--list-busy'.
* guix/scripts/gc.scm (show-help, %options): Add "--list-busy".
(guix-gc)[list-busy]: New procedure.
Handle the 'list-busy' action.
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index f1ad10acff..f1d26af3a7 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -148,9 +148,6 @@ if test "x$guix_build_daemon" = "xyes"; then AC_SUBST([GUIX_TEST_ROOT]) GUIX_CHECK_LOCALSTATEDIR - - AC_CONFIG_FILES([nix/scripts/list-runtime-roots], - [chmod +x nix/scripts/list-runtime-roots]) AC_CONFIG_FILES([nix/scripts/download], [chmod +x nix/scripts/download]) AC_CONFIG_FILES([nix/scripts/substitute], |