Skip to content

Commit 4c0bebc

Browse files
poetteringpoettering
committed
kmsg-syslogd: remove kmsg-syslogd, since it's entirely obsoleted and replaced by journald
1 parent 64f5002 commit 4c0bebc

File tree

3 files changed

+18
-444
lines changed

3 files changed

+18
-444
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ rootlibexec_PROGRAMS = \
188188
systemd-shutdown \
189189
systemd-modules-load \
190190
systemd-remount-api-vfs \
191-
systemd-kmsg-syslogd \
192191
systemd-reply-password \
193192
systemd-fsck \
194193
systemd-timestamp \
@@ -318,7 +317,6 @@ nodist_systemunit_DATA = \
318317
units/console-shell.service \
319318
units/systemd-initctl.service \
320319
units/systemd-shutdownd.service \
321-
units/systemd-kmsg-syslogd.service \
322320
units/systemd-modules-load.service \
323321
units/systemd-remount-api-vfs.service \
324322
units/systemd-update-utmp-runlevel.service \
@@ -351,7 +349,6 @@ EXTRA_DIST += \
351349
units/rescue.service.m4 \
352350
units/systemd-initctl.service.in \
353351
units/systemd-shutdownd.service.in \
354-
units/systemd-kmsg-syslogd.service.in \
355352
units/systemd-modules-load.service.in \
356353
units/systemd-remount-api-vfs.service.in \
357354
units/systemd-update-utmp-runlevel.service.in \
@@ -955,14 +952,6 @@ systemd_cgroups_agent_LDADD = \
955952
libsystemd-basic.la \
956953
$(DBUS_LIBS)
957954

958-
systemd_kmsg_syslogd_SOURCES = \
959-
src/kmsg-syslogd.c \
960-
src/fdset.c
961-
962-
systemd_kmsg_syslogd_LDADD = \
963-
libsystemd-basic.la \
964-
libsystemd-daemon.la
965-
966955
systemctl_SOURCES = \
967956
src/systemctl.c \
968957
src/utmp-wtmp.c \
@@ -2233,10 +2222,9 @@ systemd-install-data-hook:
22332222
rm -f user && \
22342223
$(LN_S) $(pkgsysconfdir)/user user )
22352224
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
2236-
rm -f systemd-initctl.socket systemd-shutdownd.socket syslog.socket && \
2225+
rm -f systemd-initctl.socket systemd-shutdownd.socket && \
22372226
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
2238-
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
2239-
$(LN_S) ../syslog.socket syslog.socket )
2227+
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
22402228
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
22412229
rm -f systemd-update-utmp-runlevel.service && \
22422230
$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -2307,8 +2295,7 @@ systemd-install-data-hook:
23072295
systemd-modules-load.service \
23082296
systemd-tmpfiles-setup.service \
23092297
systemd-sysctl.service \
2310-
systemd-ask-password-console.path \
2311-
systemd-kmsg-syslogd.service && \
2298+
systemd-ask-password-console.path && \
23122299
$(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
23132300
$(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
23142301
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
@@ -2318,8 +2305,7 @@ systemd-install-data-hook:
23182305
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
23192306
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
23202307
$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
2321-
$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
2322-
$(LN_S) ../systemd-kmsg-syslogd.service )
2308+
$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
23232309
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
23242310
rm -f systemd-tmpfiles-clean.timer && \
23252311
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )

0 commit comments

Comments
 (0)