No subject
William Douglas
william.douglas at intel.com
Wed Jun 15 10:46:09 PDT 2011
Update the syslog bridge socket and target file names to be more
descriptive of their functionality.
This is also done to make way for an actual syslogd that is intended
to be part of systemd.
---
Makefile.am | 8 ++++----
src/special.h | 4 ++--
units/fedora/prefdm.service | 2 +-
units/frugalware/display-manager.service | 2 +-
units/mandriva/prefdm.service | 2 +-
units/syslog-bridge.socket | 30 ++++++++++++++++++++++++++++++
units/syslog-bridge.target | 19 +++++++++++++++++++
units/syslog.socket | 30 ------------------------------
units/syslog.target | 19 -------------------
units/systemd-kmsg-syslogd.service.in | 2 +-
units/systemd-logger.service.in | 4 ++--
11 files changed, 61 insertions(+), 61 deletions(-)
create mode 100644 units/syslog-bridge.socket
create mode 100644 units/syslog-bridge.target
delete mode 100644 units/syslog.socket
delete mode 100644 units/syslog.target
diff --git a/Makefile.am b/Makefile.am
index 7ca0ae8..51a5ab1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -264,7 +264,7 @@ dist_systemunit_DATA = \
units/systemd-initctl.socket \
units/systemd-logger.socket \
units/systemd-shutdownd.socket \
- units/syslog.socket \
+ units/syslog-bridge.socket \
units/dev-hugepages.automount \
units/dev-hugepages.mount \
units/dev-mqueue.automount \
@@ -285,7 +285,7 @@ dist_systemunit_DATA = \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
- units/syslog.target
+ units/syslog-bridge.target
if HAVE_SYSV_COMPAT
dist_systemunit_DATA += \
@@ -1349,11 +1349,11 @@ endif
rm -f user && \
$(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
- rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
+ rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog-bridge.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
- $(LN_S) ../syslog.socket syslog.socket )
+ $(LN_S) ../syslog-bridge.socket syslog-bridge.socket )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
diff --git a/src/special.h b/src/special.h
index 08dae11..3d15fd6 100644
--- a/src/special.h
+++ b/src/special.h
@@ -53,7 +53,7 @@
#define SPECIAL_NETWORK_TARGET "network.target" /* LSB's $network */
#define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */
#define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */
-#define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog; Should pull in syslog.socket or syslog.service */
+#define SPECIAL_SYSLOG_TARGET "syslog-bridge.target" /* LSB's $syslog; Should pull in syslog-bridge.socket or syslog.service */
#define SPECIAL_TIME_SYNC_TARGET "time-sync.target" /* LSB's $time */
#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Debian's $x-display-manager */
#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */
@@ -69,7 +69,7 @@
#define SPECIAL_DBUS_SERVICE "dbus.service"
#define SPECIAL_DBUS_SOCKET "dbus.socket"
#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
-#define SPECIAL_SYSLOG_SOCKET "syslog.socket"
+#define SPECIAL_SYSLOG_SOCKET "syslog-bridge.socket"
/* Magic init signals */
#define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index e7bd123..7e1f267 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -7,7 +7,7 @@
[Unit]
Description=Display Manager
-After=syslog.target livesys-late.service rc-local.service systemd-user-sessions.service
+After=syslog-bridge.target livesys-late.service rc-local.service systemd-user-sessions.service
# On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
# avoid any races around that.
diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service
index e614225..5590e43 100644
--- a/units/frugalware/display-manager.service
+++ b/units/frugalware/display-manager.service
@@ -7,7 +7,7 @@
[Unit]
Description=Display Manager
-After=syslog.target local.service systemd-user-sessions.service
+After=syslog-bridge.target local.service systemd-user-sessions.service
[Service]
EnvironmentFile=/etc/sysconfig/desktop
diff --git a/units/mandriva/prefdm.service b/units/mandriva/prefdm.service
index d0c7f99..6050387 100644
--- a/units/mandriva/prefdm.service
+++ b/units/mandriva/prefdm.service
@@ -7,7 +7,7 @@
[Unit]
Description=Display Manager
-After=syslog.target livesys-late.service rc-local.service systemd-user-sessions.service
+After=syslog-bridge.target livesys-late.service rc-local.service systemd-user-sessions.service
After=network.target acpid.service fs.service haldaemon.service
# Do not stop plymouth, it is done in prefdm if required
diff --git a/units/syslog-bridge.socket b/units/syslog-bridge.socket
new file mode 100644
index 0000000..ed86c00
--- /dev/null
+++ b/units/syslog-bridge.socket
@@ -0,0 +1,30 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Syslog Bridge Socket
+DefaultDependencies=no
+Before=sockets.target syslog-bridge.target
+
+# Pull in syslog-bridge.target to tell people that /dev/log is now accessible
+Wants=syslog-bridge.target
+
+[Socket]
+ListenDatagram=/dev/log
+SocketMode=0666
+
+# The service we activate on incoming traffic is
+# systemd-kmsg-syslogd.service. That doesn't mean however, that this
+# is the main syslog daemon in the system. Another syslog
+# implementation (which might be started via on-boot or another
+# non-socket activation) can take over possession of the socket and
+# terminate systemd-kmsg-syslogd. It could also simply replace the
+# socket in the file system, and leave systemd-kmsg-syslogd untouched.
+
+Service=systemd-kmsg-syslogd.service
diff --git a/units/syslog-bridge.target b/units/syslog-bridge.target
new file mode 100644
index 0000000..e3ab533
--- /dev/null
+++ b/units/syslog-bridge.target
@@ -0,0 +1,19 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
+[Unit]
+Description=Syslog Bridge
+
+# Avoid that we conflict with shutdown.target, so that we can stay
+# until the very end and do not cancel shutdown.target if we should
+# hapen to be activated very late.
+DefaultDependencies=no
diff --git a/units/syslog.socket b/units/syslog.socket
deleted file mode 100644
index 500bb7c..0000000
--- a/units/syslog.socket
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Syslog Socket
-DefaultDependencies=no
-Before=sockets.target syslog.target
-
-# Pull in syslog.target to tell people that /dev/log is now accessible
-Wants=syslog.target
-
-[Socket]
-ListenDatagram=/dev/log
-SocketMode=0666
-
-# The service we activate on incoming traffic is
-# systemd-kmsg-syslogd.service. That doesn't mean however, that this
-# is the main syslog daemon in the system. Another syslog
-# implementation (which might be started via on-boot or another
-# non-socket activation) can take over possession of the socket and
-# terminate systemd-kmsg-syslogd. It could also simply replace the
-# socket in the file system, and leave systemd-kmsg-syslogd untouched.
-
-Service=systemd-kmsg-syslogd.service
diff --git a/units/syslog.target b/units/syslog.target
deleted file mode 100644
index 825b26e..0000000
--- a/units/syslog.target
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-# This exists mostly for compatibility with SysV/LSB units, and
-# implementations lacking socket/bus activation.
-
-[Unit]
-Description=Syslog
-
-# Avoid that we conflict with shutdown.target, so that we can stay
-# until the very end and do not cancel shutdown.target if we should
-# hapen to be activated very late.
-DefaultDependencies=no
diff --git a/units/systemd-kmsg-syslogd.service.in b/units/systemd-kmsg-syslogd.service.in
index b20889e..307165c 100644
--- a/units/systemd-kmsg-syslogd.service.in
+++ b/units/systemd-kmsg-syslogd.service.in
@@ -15,5 +15,5 @@ DefaultDependencies=no
ExecStart=@rootlibexecdir@/systemd-kmsg-syslogd
NotifyAccess=all
StandardOutput=null
-Sockets=syslog.socket
+Sockets=syslog-bridge.socket
CapabilityBoundingSet=CAP_DAC_OVERRIDE
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 5f7fe40..23c8fc5 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -10,8 +10,8 @@
[Unit]
Description=Stdio Syslog Bridge
DefaultDependencies=no
-Requires=syslog.socket
-After=syslog.socket
+Requires=syslog-bridge.socket
+After=syslog-bridge.socket
[Service]
ExecStart=@rootlibexecdir@/systemd-logger
--
1.7.2.3
More information about the systemd-devel
mailing list