diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-02 22:39:48 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-25 23:44:20 +0100 |
| commit | 21531add3205e400707c8fbfd841845f9a71863a (patch) | |
| tree | 8a88aa7b2fe01f5707bcf130fe09d54c0a95d33f /config-daemon.ac | |
| parent | 6634180f9eabc70cdc5bc8e9ce2ff0f9250625bc (diff) | |
offload: Use Guile-SSH instead of GNU lsh.
* guix/scripts/offload.scm (<build-machine>)[ssh-options]: Remove.
[host-key, host-key-type]: New fields.
(%lsh-command, %lshg-command, user-lsh-private-key): Remove.
(user-openssh-private-key, private-key-from-file*): New procedures.
(host-key->type+key, open-ssh-session): New procedures.
(remote-pipe): Remove 'mode' parameter. Rewrite in terms of
'open-ssh-session' etc. Update users.
(send-files)[missing-files]: Rewrite using the bidirectional channel
port.
Remove call to 'call-with-compressed-output-port'.
(retrieve-files): Remove call to 'call-with-decompressed-port'.
(machine-load): Remove exit status logic.
* doc/guix.texi (Requirements): Mention Guile-SSH.
(Daemon Offload Setup): Document 'host-key' and 'private-key'. Show the
default value on each @item line.
* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): New macro.
* config-daemon.ac: Use 'GUIX_CHECK_GUILE_SSH'. Set
'HAVE_DAEMON_OFFLOAD_HOOK' as a function of that.
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 8a3e6d8b601..056c939e390 100644 --- a/config-daemon.ac +++ b/config-daemon.ac | |||
| @@ -128,12 +128,20 @@ if test "x$guix_build_daemon" = "xyes"; then | |||
| 128 | dnl 'restore-file-set', which requires unbuffered custom binary input | 128 | dnl 'restore-file-set', which requires unbuffered custom binary input |
| 129 | dnl ports from Guile >= 2.0.10.) | 129 | dnl ports from Guile >= 2.0.10.) |
| 130 | GUIX_CHECK_UNBUFFERED_CBIP | 130 | GUIX_CHECK_UNBUFFERED_CBIP |
| 131 | guix_build_daemon_offload="$ac_cv_guix_cbips_support_setvbuf" | ||
| 132 | 131 | ||
| 133 | if test "x$guix_build_daemon_offload" = "xyes"; then | 132 | dnl Check for Guile-SSH, which is required by 'guix offload'. |
| 134 | AC_DEFINE([HAVE_DAEMON_OFFLOAD_HOOK], [1], | 133 | GUIX_CHECK_GUILE_SSH |
| 135 | [Define if the daemon's 'offload' build hook is being built.]) | 134 | |
| 136 | fi | 135 | case "x$ac_cv_guix_cbips_support_setvbuf$guix_cv_have_recent_guile_ssh" in |
| 136 | xyesyes) | ||
| 137 | guix_build_daemon_offload="yes" | ||
| 138 | AC_DEFINE([HAVE_DAEMON_OFFLOAD_HOOK], [1], | ||
| 139 | [Define if the daemon's 'offload' build hook is being built (requires Guile-SSH).]) | ||
| 140 | ;; | ||
| 141 | *) | ||
| 142 | guix_build_daemon_offload="no" | ||
| 143 | ;; | ||
| 144 | esac | ||
| 137 | 145 | ||
| 138 | dnl Temporary directory used to store the daemon's data. | 146 | dnl Temporary directory used to store the daemon's data. |
| 139 | GUIX_TEST_ROOT_DIRECTORY | 147 | GUIX_TEST_ROOT_DIRECTORY |
