Browse Source

daemon: Run 'guix authenticate' directly.

* 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'.
wip-system-bootstrap
Ludovic Courtès 3 years ago
parent
commit
0c684b7edf
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 2
      config-daemon.ac
  2. 5
      nix/libstore/local-store.cc
  3. 3
      nix/local.mk
  4. 11
      nix/scripts/authenticate.in

2
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

5
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,

3
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

11
nix/scripts/authenticate.in

@ -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
Loading…
Cancel
Save