[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#37302] [PATCH 2/7] daemon: Run 'guix authenticate' directly.
From: |
Ludovic Courtès |
Subject: |
[bug#37302] [PATCH 2/7] daemon: Run 'guix authenticate' directly. |
Date: |
Wed, 4 Sep 2019 12:26:58 +0200 |
* nix/scripts/authenticate.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove
scripts/authenticate.
* config-daemon.ac: Don't output 'nix/scripts/authenticate'.
* nix/libstore/local-store.cc (runAuthenticationProgram): Run 'guix
authenticate'.
---
config-daemon.ac | 2 --
nix/libstore/local-store.cc | 5 +++--
nix/local.mk | 3 ---
nix/scripts/authenticate.in | 11 -----------
4 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100644 nix/scripts/authenticate.in
diff --git a/config-daemon.ac b/config-daemon.ac
index f1d26af3a7..907457f478 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -152,8 +152,6 @@ if test "x$guix_build_daemon" = "xyes"; then
[chmod +x nix/scripts/download])
AC_CONFIG_FILES([nix/scripts/substitute],
[chmod +x nix/scripts/substitute])
- AC_CONFIG_FILES([nix/scripts/authenticate],
- [chmod +x nix/scripts/authenticate])
AC_CONFIG_FILES([nix/scripts/offload],
[chmod +x nix/scripts/offload])
fi
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 892d9300b1..951c35faf3 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/libstore/local-store.cc
@@ -1224,8 +1224,9 @@ static void checkSecrecy(const Path & path)
static std::string runAuthenticationProgram(const Strings & args)
{
- return runProgram(settings.nixLibexecDir + "/authenticate",
- false, args);
+ Strings fullArgs = { "authenticate" };
+ fullArgs.insert(fullArgs.end(), args.begin(), args.end()); // append
+ return runProgram(settings.guixProgram, false, fullArgs);
}
void LocalStore::exportPath(const Path & path, bool sign,
diff --git a/nix/local.mk b/nix/local.mk
index fd7379b5ff..cdcd9eb1c2 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -165,9 +165,6 @@ nodist_pkglibexec_SCRIPTS += \
endif BUILD_DAEMON_OFFLOAD
-nodist_pkglibexec_SCRIPTS += \
- %D%/scripts/authenticate
-
# The '.service' files for systemd.
systemdservicedir = $(libdir)/systemd/system
nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service
diff --git a/nix/scripts/authenticate.in b/nix/scripts/authenticate.in
deleted file mode 100644
index 5ce57915f0..0000000000
--- a/nix/scripts/authenticate.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@SHELL@
-# A shorthand for "guix authenticate", for use by the daemon.
-
-if test "x$GUIX_UNINSTALLED" = "x"
-then
- prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- exec "@bindir@/guix" authenticate "$@"
-else
- exec guix authenticate "$@"
-fi
--
2.23.0
- [bug#37302] [PATCH 0/7] Remove the daemon's libexec helpers, Ludovic Courtès, 2019/09/04
- [bug#37302] [PATCH 1/7] daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'., Ludovic Courtès, 2019/09/04
- [bug#37302] [PATCH 3/7] daemon: Run 'guix perform-download' directly., Ludovic Courtès, 2019/09/04
- [bug#37302] [PATCH 4/7] daemon: Run 'guix offload' directly., Ludovic Courtès, 2019/09/04
- [bug#37302] [PATCH 2/7] daemon: Run 'guix authenticate' directly.,
Ludovic Courtès <=
- [bug#37302] [PATCH 7/7] etc: Remove references to libexec/guix* from SELinux policy., Ludovic Courtès, 2019/09/04
- [bug#37302] [PATCH 6/7] daemon: Remove 'NIX_LIBEXEC_DIR'., Ludovic Courtès, 2019/09/04
- [bug#37302] [PATCH 5/7] daemon: Run 'guix substitute' directly and assume a single substituter., Ludovic Courtès, 2019/09/04
- bug#37302: [PATCH 0/7] Remove the daemon's libexec helpers, Ludovic Courtès, 2019/09/08