summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am1
-rw-r--r--man/systemd.special.xml23
-rw-r--r--src/core/service.c16
-rw-r--r--src/core/special.h3
-rw-r--r--units/syslog.socket5
-rw-r--r--units/syslog.target19
-rw-r--r--units/systemd-journald.socket2
7 files changed, 10 insertions, 59 deletions
diff --git a/Makefile.am b/Makefile.am
index 5692077b34..db68522bf6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -291,7 +291,6 @@ dist_systemunit_DATA = \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
- units/syslog.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 81374c2ade..6acba91428 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -93,7 +93,6 @@
<filename>swap.target</filename>,
<filename>sysinit.target</filename>,
<filename>syslog.socket</filename>,
- <filename>syslog.target</filename>,
<filename>system-update.target</filename>,
<filename>time-sync.target</filename>,
<filename>umount.target</filename></para>
@@ -335,15 +334,6 @@
<option>auto</option> and
<option>comment=systemd.mount</option>
mount options set.</para>
-
- <para>systemd automatically
- adds dependencies of type
- After for this target unit to
- all SysV init script service
- units with an LSB header
- referring to the
- <literal>$local_fs</literal>
- facility.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -680,19 +670,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>syslog.target</filename></term>
- <listitem>
- <para>systemd automatically
- adds dependencies of type
- After for this target unit to
- all SysV init script service
- units with an LSB header
- referring to the
- <literal>$syslog</literal>
- facility.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><filename>system-update.target</filename></term>
<listitem>
<para>A special target unit
diff --git a/src/core/service.c b/src/core/service.c
index 017d292a8b..ebd0baea89 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -322,7 +322,8 @@ static void service_done(Unit *u) {
static char *sysv_translate_name(const char *name) {
char *r;
- if (!(r = new(char, strlen(name) + sizeof(".service"))))
+ r = new(char, strlen(name) + sizeof(".service"));
+ if (!r)
return NULL;
if (endswith(name, ".sh"))
@@ -348,16 +349,12 @@ static int sysv_translate_facility(const char *name, const char *filename, char
static const char * const table[] = {
/* LSB defined facilities */
- "local_fs", SPECIAL_LOCAL_FS_TARGET,
- /* Due to unfortunate name selection in Mandriva,
- * $network is provided by network-up which is ordered
- * after network which actually starts interfaces.
- * To break the loop, just ignore it */
+ "local_fs", NULL,
"network", SPECIAL_NETWORK_TARGET,
"named", SPECIAL_NSS_LOOKUP_TARGET,
"portmap", SPECIAL_RPCBIND_TARGET,
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
- "syslog", SPECIAL_SYSLOG_TARGET,
+ "syslog", NULL,
"time", SPECIAL_TIME_SYNC_TARGET,
};
@@ -378,8 +375,9 @@ static int sysv_translate_facility(const char *name, const char *filename, char
if (!table[i+1])
return 0;
- if (!(r = strdup(table[i+1])))
- return -ENOMEM;
+ r = strdup(table[i+1]);
+ if (!r)
+ return log_oom();
goto finish;
}
diff --git a/src/core/special.h b/src/core/special.h
index 626e816922..99c0e1222e 100644
--- a/src/core/special.h
+++ b/src/core/special.h
@@ -46,7 +46,7 @@
/* Early boot targets */
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
#define SPECIAL_SOCKETS_TARGET "sockets.target"
-#define SPECIAL_LOCAL_FS_TARGET "local-fs.target" /* LSB's $local_fs */
+#define SPECIAL_LOCAL_FS_TARGET "local-fs.target"
#define SPECIAL_LOCAL_FS_PRE_TARGET "local-fs-pre.target"
#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" /* LSB's $remote_fs */
#define SPECIAL_REMOTE_FS_PRE_TARGET "remote-fs-pre.target"
@@ -57,7 +57,6 @@
#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 */
#define SPECIAL_TIME_SYNC_TARGET "time-sync.target" /* LSB's $time */
/*
diff --git a/units/syslog.socket b/units/syslog.socket
index c784357627..e6e9cf8525 100644
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -10,14 +10,11 @@ Description=Syslog Socket
Documentation=man:systemd.special(7)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog
DefaultDependencies=no
-Before=sockets.target syslog.target shutdown.target
+Before=sockets.target shutdown.target
# Don't allow logging until the very end
Conflicts=shutdown.target
-# Pull in syslog.target to tell people that /dev/log is now accessible
-Wants=syslog.target
-
[Socket]
ListenDatagram=/run/systemd/journal/syslog
SocketMode=0666
diff --git a/units/syslog.target b/units/syslog.target
deleted file mode 100644
index 423fef30ad..0000000000
--- 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 Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-# This exists mostly for compatibility with SysV/LSB units, and
-# implementations lacking socket/bus activation.
-
-[Unit]
-Description=Syslog
-Documentation=man:systemd.special(7)
-Documentation=http://www.freedesktop.org/wiki/Software/systemd/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
-# happen to be activated very late.
-DefaultDependencies=no
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index dbe8882c0e..4f0619d258 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -9,7 +9,7 @@
Description=Journal Socket
Documentation=man:systemd-journald.service(8) man:journald.conf(5)
DefaultDependencies=no
-Before=sockets.target syslog.target
+Before=sockets.target
# Mount and swap units need this. If this socket unit is removed by an
# isolate request the mount and and swap units would be removed too,
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-04 06:35:58 +0000