diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2023-07-20 12:13:55 -0700 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2024-03-11 14:34:25 -0700 |
| commit | 5f100c68a4a8ef9ed5599bb99c910018869bc6f3 (patch) | |
| tree | efe4edbe60c483760ae914d2fa996d087156297b | |
| parent | 8f4ffb3fae133bb21d7991e97c2f19a7108b1143 (diff) | |
etc: systemd services: switch to "journal" for output and error logging.
The "syslog" method has been deprecated for years, and issues a warning:
Standard output type syslog is obsolete, automatically updating to
journal. Please update your unit file, and consider removing the setting
altogether.
Fixes: #48323
* etc/guix-daemon.service.in (StandardOutput): Use "journal"
(StandardError): Likewise.
* etc/guix-publish.service.in (StandardOutput): Likewise.
(StandardError): Likewise.
| -rw-r--r-- | etc/guix-daemon.service.in | 4 | ||||
| -rw-r--r-- | etc/guix-publish.service.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 9dbc3b56780..5e75379b5e4 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in | |||
| @@ -9,8 +9,8 @@ Description=Build daemon for GNU Guix | |||
| 9 | ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ | 9 | ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ |
| 10 | --build-users-group=guixbuild --discover=no | 10 | --build-users-group=guixbuild --discover=no |
| 11 | 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 |
| 12 | StandardOutput=syslog | 12 | StandardOutput=journal |
| 13 | StandardError=syslog | 13 | StandardError=journal |
| 14 | 14 | ||
| 15 | # Work around a nasty systemd ‘feature’ that kills the entire process tree | 15 | # Work around a nasty systemd ‘feature’ that kills the entire process tree |
| 16 | # (including the daemon!) if any child, such as cc1plus, runs out of memory. | 16 | # (including the daemon!) if any child, such as cc1plus, runs out of memory. |
diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in index b8fd3b4c036..0d82e73d944 100644 --- a/etc/guix-publish.service.in +++ b/etc/guix-publish.service.in | |||
| @@ -11,8 +11,8 @@ After=guix-daemon.service | |||
| 11 | [Service] | 11 | [Service] |
| 12 | ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 | 12 | ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 |
| 13 | Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 | 13 | Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 |
| 14 | StandardOutput=syslog | 14 | StandardOutput=journal |
| 15 | StandardError=syslog | 15 | StandardError=journal |
| 16 | 16 | ||
| 17 | # Despite the name, this is rate-limited: a broken daemon will eventually fail. | 17 | # Despite the name, this is rate-limited: a broken daemon will eventually fail. |
| 18 | Restart=always | 18 | Restart=always |
