diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-07-05 16:44:29 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-07-07 23:54:20 -0400 |
| commit | 4cbe0127a668cbcc64087c5d311308b59d39b104 (patch) | |
| tree | dfc1d26a82ff37616ec855423853ba1c2dfe1552 /etc/guix-daemon.service.in | |
| parent | ac3444968a8a081c17208ee6a9016f46b011167c (diff) | |
guix-install.sh: Prompt for configuring substitutes discovery.
Also ensure prompt_yes_no always print the message with a trailing space,
which is more pleasing to the eye.
* etc/guix-daemon.conf.in <--discover=no>: New guix-daemon option.
* etc/guix-daemon.service.in: Likewise.
* etc/init.d/guix-daemon.in: Likewise.
* etc/openrc/guix-daemon.in: Likewise.
* etc/guix-install.sh (configure_substitute_discovery): New procedure.
(sys_enable_guix_daemon): Ask the user whether automatic substitute discovery
should be enabled. Set the '--discover' argument accordingly.
(prompt_yes_no): Add a trailing space to the message.
(sys_authorize_build_farms): Remove trailing space from the message argument.
* NEWS (Distribution): Add news.
Diffstat (limited to 'etc/guix-daemon.service.in')
| -rw-r--r-- | etc/guix-daemon.service.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 407cdd199c8..17b54eaeb06 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | Description=Build daemon for GNU Guix | 6 | Description=Build daemon for GNU Guix |
| 7 | 7 | ||
| 8 | [Service] | 8 | [Service] |
| 9 | ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild | 9 | ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ |
| 10 | --build-users-group=guixbuild --discover=no | ||
| 10 | Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 | 11 | Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 |
| 11 | RemainAfterExit=yes | 12 | RemainAfterExit=yes |
| 12 | StandardOutput=syslog | 13 | StandardOutput=syslog |
