From 8c483c12e94bcf43e4c44170f1d5fea5fbba4970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 16 Feb 2025 23:09:41 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"services:=20Switch=20to=20=E2=80=98sh?=
 =?UTF-8?q?epherd-system-log-service-type=E2=80=99=20in=20=E2=80=98%base-s?=
 =?UTF-8?q?ervices=E2=80=99."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c83bfc0415ba928b746362915d67600cdbb5da62 and the
corresponding ‘etc/news.scm’ entry (commits
12bd93113c7a2ddf8c1db849550d1c0ae356f039 and
622568ec13b54ad8caaa7f67d1e8686073749b8b) while investigating
<https://issues.guix.gnu.org/76315>.

Change-Id: Ie26c24b8cd25cee3466cc871470b0bec9a5dfafb
---
 doc/guix.texi         | 17 ++++-------------
 etc/news.scm          | 36 ------------------------------------
 gnu/services/base.scm |  2 +-
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 93b0ad113b..51bb4b38b6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19880,17 +19880,11 @@ privacy---often the result of host name lookups is in local cache, so
 external name servers do not even need to be queried.
 @end defvar
 
-@cindex syslog, with external syslogd
-@cindex logging, syslog
+@cindex syslog
+@cindex logging
 @defvar syslog-service-type
-Type of the service that runs the syslog daemon (@command{syslogd}),
-whose value is a @code{<syslog-configuration>} object (see below).
-
-@quotation Note
-This service is redundant with and for the most part superseded by
-@code{shepherd-system-log-service-type} (@pxref{shepherd-system-log, the
-Shepherd system log}).
-@end quotation
+Type of the service that runs the syslog daemon, whose value is a
+@code{<syslog-configuration>} object.
 @end defvar
 
 To have a modified @code{syslog-configuration} come into effect after
@@ -46057,7 +46051,6 @@ herd schedule timer at 07:00 -- mpg123 Music/alarm.mp3
 on the @code{timer} service.
 @end defvar
 
-@anchor{shepherd-system-log}
 @cindex system log service, from Shepherd
 @cindex syslogd, Shepherd system log service
 @defvar shepherd-system-log-service-type
@@ -46068,8 +46061,6 @@ traditionally implemented by @command{syslogd} programs.
 
 The value of services of this type must be a
 @code{system-log-configuration} record, as described below.
-
-This service is part of @code{%base-services} (@pxref{Base Services}).
 @end defvar
 
 @c %start of fragment
diff --git a/etc/news.scm b/etc/news.scm
index 7e40fa04a5..106a58a2b0 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -37,42 +37,6 @@
 (channel-news
  (version 0)
 
- (entry (commit "c83bfc0415ba928b746362915d67600cdbb5da62")
-        (title
-         (en "Guix System switches to the Shepherd's system log")
-         (de "Guix System wechselt zu Shepherds Systemprotokoll")
-         (fr "Guix System passe au journal système de Shepherd"))
-        (body
-         (en "The default system log used on Guix System and part of
-@code{%base-services} has been switched from the @command{syslogd} command of
-GNU@tie{}Inetutils to the new built-in @code{system-log} service found in
-version 1.0 of the Shepherd.
-
-The advantages of this change are the fact that @code{system-log} can start
-logging earlier after boot and stop shortly before shutdown, along with full
-integration with the rest of @command{shepherd}, in particular with the new
-@code{log-rotation} service.")
-         (de "Das vorgegebene Systemprotokoll, das auf Guix System benutzt
-wird und Teil von @code{%base-services} ist, wurde ausgetauscht und anstelle
-des Befehls @command{syslogd} aus den GNU@tie{}Inetutils wird der neue, in
-Version 1.0 von Shepherd eingebaute @code{system-log}-Dienst benutzt.
-
-Die Vorteile dieser Änderung sind, dass @code{system-log} schon früher nach
-dem Start Protokolle aufnehmen kann, kurz vor dem Herunterfahren damit aufhört
-und außerdem mit dem Rest von @command{shepherd} voll integriert ist,
-insbesondere mit dem neuen Dienst @code{log-rotation} zur
-Protokollrotation.")
-         (fr "Le journal système par défaut sur Guix System, qui fait partie
-de @code{%base-services}, est passé de la commande @command{syslogd} de
-GNU@tie{}Inetutils au nouveau service @code{system-log} fourni par la version
-1.0 du Shepherd.
-
-Les avantages de ce changement sont le fait que @code{system-log} peut
-commencer à enregistrer les journaux plus tôt pendant la séquence de
-démarrage et s'arrêter plus tard au moment de l'arrêt, ainsi que son
-intégration complète avec le reste de @command{shepherd}, en particulier avec
-le nouveau service @code{log-rotation}.")))
-
  (entry (commit "0753a17ddf6f4fab98b93c25f1a93b97ff9e46bb")
         (title
          (en "The @command{guix deploy} command now supports the Hetzner Cloud
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 684de754e6..4bc0433def 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -3931,7 +3931,7 @@ login manager daemon.")
                         (cons tty %default-console-font))
                       '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
 
-        (service shepherd-system-log-service-type)
+        (service syslog-service-type)
         (service agetty-service-type (agetty-configuration
                                        (extra-options '("-L")) ; no carrier detect
                                        (term "vt100")