summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am368
-rw-r--r--src/libelogind/.gitignore (renamed from src/libsystemd/.gitignore)0
l---------src/libelogind/Makefile (renamed from src/libsystemd/Makefile)0
-rw-r--r--src/libelogind/libelogind.sym.m4 (renamed from src/libsystemd/libsystemd.sym.m4)0
-rw-r--r--src/libelogind/libsystemd.pc.in (renamed from src/libsystemd/libsystemd.pc.in)0
-rw-r--r--src/libelogind/sd-bus/DIFFERENCES (renamed from src/libsystemd/sd-bus/DIFFERENCES)0
-rw-r--r--src/libelogind/sd-bus/GVARIANT-SERIALIZATION (renamed from src/libsystemd/sd-bus/GVARIANT-SERIALIZATION)0
l---------src/libelogind/sd-bus/Makefile (renamed from src/libsystemd/sd-bus/Makefile)0
-rw-r--r--src/libelogind/sd-bus/PORTING-DBUS1 (renamed from src/libsystemd/sd-bus/PORTING-DBUS1)0
-rw-r--r--src/libelogind/sd-bus/bus-bloom.c (renamed from src/libsystemd/sd-bus/bus-bloom.c)0
-rw-r--r--src/libelogind/sd-bus/bus-bloom.h (renamed from src/libsystemd/sd-bus/bus-bloom.h)0
-rw-r--r--src/libelogind/sd-bus/bus-common-errors.c (renamed from src/libsystemd/sd-bus/bus-common-errors.c)0
-rw-r--r--src/libelogind/sd-bus/bus-common-errors.h (renamed from src/libsystemd/sd-bus/bus-common-errors.h)0
-rw-r--r--src/libelogind/sd-bus/bus-container.c (renamed from src/libsystemd/sd-bus/bus-container.c)0
-rw-r--r--src/libelogind/sd-bus/bus-container.h (renamed from src/libsystemd/sd-bus/bus-container.h)0
-rw-r--r--src/libelogind/sd-bus/bus-control.c (renamed from src/libsystemd/sd-bus/bus-control.c)0
-rw-r--r--src/libelogind/sd-bus/bus-control.h (renamed from src/libsystemd/sd-bus/bus-control.h)0
-rw-r--r--src/libelogind/sd-bus/bus-convenience.c (renamed from src/libsystemd/sd-bus/bus-convenience.c)0
-rw-r--r--src/libelogind/sd-bus/bus-creds.c (renamed from src/libsystemd/sd-bus/bus-creds.c)0
-rw-r--r--src/libelogind/sd-bus/bus-creds.h (renamed from src/libsystemd/sd-bus/bus-creds.h)0
-rw-r--r--src/libelogind/sd-bus/bus-dump.c (renamed from src/libsystemd/sd-bus/bus-dump.c)0
-rw-r--r--src/libelogind/sd-bus/bus-dump.h (renamed from src/libsystemd/sd-bus/bus-dump.h)0
-rw-r--r--src/libelogind/sd-bus/bus-error.c (renamed from src/libsystemd/sd-bus/bus-error.c)0
-rw-r--r--src/libelogind/sd-bus/bus-error.h (renamed from src/libsystemd/sd-bus/bus-error.h)0
-rw-r--r--src/libelogind/sd-bus/bus-gvariant.c (renamed from src/libsystemd/sd-bus/bus-gvariant.c)0
-rw-r--r--src/libelogind/sd-bus/bus-gvariant.h (renamed from src/libsystemd/sd-bus/bus-gvariant.h)0
-rw-r--r--src/libelogind/sd-bus/bus-internal.c (renamed from src/libsystemd/sd-bus/bus-internal.c)0
-rw-r--r--src/libelogind/sd-bus/bus-internal.h (renamed from src/libsystemd/sd-bus/bus-internal.h)0
-rw-r--r--src/libelogind/sd-bus/bus-introspect.c (renamed from src/libsystemd/sd-bus/bus-introspect.c)0
-rw-r--r--src/libelogind/sd-bus/bus-introspect.h (renamed from src/libsystemd/sd-bus/bus-introspect.h)0
-rw-r--r--src/libelogind/sd-bus/bus-kernel.c (renamed from src/libsystemd/sd-bus/bus-kernel.c)0
-rw-r--r--src/libelogind/sd-bus/bus-kernel.h (renamed from src/libsystemd/sd-bus/bus-kernel.h)0
-rw-r--r--src/libelogind/sd-bus/bus-match.c (renamed from src/libsystemd/sd-bus/bus-match.c)0
-rw-r--r--src/libelogind/sd-bus/bus-match.h (renamed from src/libsystemd/sd-bus/bus-match.h)0
-rw-r--r--src/libelogind/sd-bus/bus-message.c (renamed from src/libsystemd/sd-bus/bus-message.c)0
-rw-r--r--src/libelogind/sd-bus/bus-message.h (renamed from src/libsystemd/sd-bus/bus-message.h)0
-rw-r--r--src/libelogind/sd-bus/bus-objects.c (renamed from src/libsystemd/sd-bus/bus-objects.c)0
-rw-r--r--src/libelogind/sd-bus/bus-objects.h (renamed from src/libsystemd/sd-bus/bus-objects.h)0
-rw-r--r--src/libelogind/sd-bus/bus-protocol.h (renamed from src/libsystemd/sd-bus/bus-protocol.h)0
-rw-r--r--src/libelogind/sd-bus/bus-signature.c (renamed from src/libsystemd/sd-bus/bus-signature.c)0
-rw-r--r--src/libelogind/sd-bus/bus-signature.h (renamed from src/libsystemd/sd-bus/bus-signature.h)0
-rw-r--r--src/libelogind/sd-bus/bus-slot.c (renamed from src/libsystemd/sd-bus/bus-slot.c)0
-rw-r--r--src/libelogind/sd-bus/bus-slot.h (renamed from src/libsystemd/sd-bus/bus-slot.h)0
-rw-r--r--src/libelogind/sd-bus/bus-socket.c (renamed from src/libsystemd/sd-bus/bus-socket.c)0
-rw-r--r--src/libelogind/sd-bus/bus-socket.h (renamed from src/libsystemd/sd-bus/bus-socket.h)0
-rw-r--r--src/libelogind/sd-bus/bus-track.c (renamed from src/libsystemd/sd-bus/bus-track.c)0
-rw-r--r--src/libelogind/sd-bus/bus-track.h (renamed from src/libsystemd/sd-bus/bus-track.h)0
-rw-r--r--src/libelogind/sd-bus/bus-type.c (renamed from src/libsystemd/sd-bus/bus-type.c)0
-rw-r--r--src/libelogind/sd-bus/bus-type.h (renamed from src/libsystemd/sd-bus/bus-type.h)0
-rw-r--r--src/libelogind/sd-bus/bus-util.c (renamed from src/libsystemd/sd-bus/bus-util.c)0
-rw-r--r--src/libelogind/sd-bus/bus-util.h (renamed from src/libsystemd/sd-bus/bus-util.h)0
-rw-r--r--src/libelogind/sd-bus/busctl-introspect.c (renamed from src/libsystemd/sd-bus/busctl-introspect.c)0
-rw-r--r--src/libelogind/sd-bus/busctl-introspect.h (renamed from src/libsystemd/sd-bus/busctl-introspect.h)0
-rw-r--r--src/libelogind/sd-bus/busctl.c (renamed from src/libsystemd/sd-bus/busctl.c)0
-rw-r--r--src/libelogind/sd-bus/kdbus.h (renamed from src/libsystemd/sd-bus/kdbus.h)0
-rw-r--r--src/libelogind/sd-bus/sd-bus.c (renamed from src/libsystemd/sd-bus/sd-bus.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-chat.c (renamed from src/libsystemd/sd-bus/test-bus-chat.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-cleanup.c (renamed from src/libsystemd/sd-bus/test-bus-cleanup.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-creds.c (renamed from src/libsystemd/sd-bus/test-bus-creds.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-error.c (renamed from src/libsystemd/sd-bus/test-bus-error.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-gvariant.c (renamed from src/libsystemd/sd-bus/test-bus-gvariant.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-introspect.c (renamed from src/libsystemd/sd-bus/test-bus-introspect.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-kernel-benchmark.c (renamed from src/libsystemd/sd-bus/test-bus-kernel-benchmark.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-kernel-bloom.c (renamed from src/libsystemd/sd-bus/test-bus-kernel-bloom.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-kernel.c (renamed from src/libsystemd/sd-bus/test-bus-kernel.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-marshal.c (renamed from src/libsystemd/sd-bus/test-bus-marshal.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-match.c (renamed from src/libsystemd/sd-bus/test-bus-match.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-objects.c (renamed from src/libsystemd/sd-bus/test-bus-objects.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-server.c (renamed from src/libsystemd/sd-bus/test-bus-server.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-signature.c (renamed from src/libsystemd/sd-bus/test-bus-signature.c)0
-rw-r--r--src/libelogind/sd-bus/test-bus-zero-copy.c (renamed from src/libsystemd/sd-bus/test-bus-zero-copy.c)0
l---------src/libelogind/sd-daemon/Makefile (renamed from src/libsystemd/sd-daemon/Makefile)0
-rw-r--r--src/libelogind/sd-daemon/sd-daemon.c (renamed from src/libsystemd/sd-daemon/sd-daemon.c)0
-rw-r--r--src/libelogind/sd-device/device-internal.h (renamed from src/libsystemd/sd-device/device-internal.h)0
-rw-r--r--src/libelogind/sd-device/device-private.c (renamed from src/libsystemd/sd-device/device-private.c)0
-rw-r--r--src/libelogind/sd-device/device-private.h (renamed from src/libsystemd/sd-device/device-private.h)0
-rw-r--r--src/libelogind/sd-device/device-util.h (renamed from src/libsystemd/sd-device/device-util.h)0
-rw-r--r--src/libelogind/sd-device/sd-device.c (renamed from src/libsystemd/sd-device/sd-device.c)0
l---------src/libelogind/sd-event/Makefile (renamed from src/libsystemd/sd-event/Makefile)0
-rw-r--r--src/libelogind/sd-event/event-util.h (renamed from src/libsystemd/sd-event/event-util.h)0
-rw-r--r--src/libelogind/sd-event/sd-event.c (renamed from src/libsystemd/sd-event/sd-event.c)0
-rw-r--r--src/libelogind/sd-event/test-event.c (renamed from src/libsystemd/sd-event/test-event.c)0
l---------src/libelogind/sd-hwdb/Makefile (renamed from src/libsystemd/sd-hwdb/Makefile)0
-rw-r--r--src/libelogind/sd-hwdb/hwdb-internal.h (renamed from src/libsystemd/sd-hwdb/hwdb-internal.h)0
-rw-r--r--src/libelogind/sd-hwdb/hwdb-util.h (renamed from src/libsystemd/sd-hwdb/hwdb-util.h)0
-rw-r--r--src/libelogind/sd-hwdb/sd-hwdb.c (renamed from src/libsystemd/sd-hwdb/sd-hwdb.c)0
l---------src/libelogind/sd-id128/Makefile (renamed from src/libsystemd/sd-id128/Makefile)0
-rw-r--r--src/libelogind/sd-id128/libsystemd-id128.pc.in (renamed from src/libsystemd/sd-id128/libsystemd-id128.pc.in)0
-rw-r--r--src/libelogind/sd-id128/sd-id128.c (renamed from src/libsystemd/sd-id128/sd-id128.c)0
l---------src/libelogind/sd-login/Makefile (renamed from src/libsystemd/sd-login/Makefile)0
-rw-r--r--src/libelogind/sd-login/sd-login.c (renamed from src/libsystemd/sd-login/sd-login.c)0
-rw-r--r--src/libelogind/sd-login/test-login.c (renamed from src/libsystemd/sd-login/test-login.c)0
l---------src/libelogind/sd-network/Makefile (renamed from src/libsystemd/sd-network/Makefile)0
-rw-r--r--src/libelogind/sd-network/network-util.c (renamed from src/libsystemd/sd-network/network-util.c)0
-rw-r--r--src/libelogind/sd-network/network-util.h (renamed from src/libsystemd/sd-network/network-util.h)0
-rw-r--r--src/libelogind/sd-network/sd-network.c (renamed from src/libsystemd/sd-network/sd-network.c)0
l---------src/libelogind/sd-path/Makefile (renamed from src/libsystemd/sd-path/Makefile)0
-rw-r--r--src/libelogind/sd-path/sd-path.c (renamed from src/libsystemd/sd-path/sd-path.c)0
l---------src/libelogind/sd-resolve/Makefile (renamed from src/libsystemd/sd-resolve/Makefile)0
-rw-r--r--src/libelogind/sd-resolve/resolve-util.h (renamed from src/libsystemd/sd-resolve/resolve-util.h)0
-rw-r--r--src/libelogind/sd-resolve/sd-resolve.c (renamed from src/libsystemd/sd-resolve/sd-resolve.c)0
-rw-r--r--src/libelogind/sd-resolve/test-resolve.c (renamed from src/libsystemd/sd-resolve/test-resolve.c)0
l---------src/libelogind/sd-rtnl/Makefile (renamed from src/libsystemd/sd-rtnl/Makefile)0
-rw-r--r--src/libelogind/sd-rtnl/local-addresses.c (renamed from src/libsystemd/sd-rtnl/local-addresses.c)0
-rw-r--r--src/libelogind/sd-rtnl/local-addresses.h (renamed from src/libsystemd/sd-rtnl/local-addresses.h)0
-rw-r--r--src/libelogind/sd-rtnl/rtnl-internal.h (renamed from src/libsystemd/sd-rtnl/rtnl-internal.h)0
-rw-r--r--src/libelogind/sd-rtnl/rtnl-message.c (renamed from src/libsystemd/sd-rtnl/rtnl-message.c)0
-rw-r--r--src/libelogind/sd-rtnl/rtnl-types.c (renamed from src/libsystemd/sd-rtnl/rtnl-types.c)0
-rw-r--r--src/libelogind/sd-rtnl/rtnl-types.h (renamed from src/libsystemd/sd-rtnl/rtnl-types.h)0
-rw-r--r--src/libelogind/sd-rtnl/rtnl-util.c (renamed from src/libsystemd/sd-rtnl/rtnl-util.c)0
-rw-r--r--src/libelogind/sd-rtnl/rtnl-util.h (renamed from src/libsystemd/sd-rtnl/rtnl-util.h)0
-rw-r--r--src/libelogind/sd-rtnl/sd-rtnl.c (renamed from src/libsystemd/sd-rtnl/sd-rtnl.c)0
-rw-r--r--src/libelogind/sd-rtnl/test-local-addresses.c (renamed from src/libsystemd/sd-rtnl/test-local-addresses.c)0
-rw-r--r--src/libelogind/sd-rtnl/test-rtnl.c (renamed from src/libsystemd/sd-rtnl/test-rtnl.c)0
l---------src/libelogind/sd-utf8/Makefile (renamed from src/libsystemd/sd-utf8/Makefile)0
-rw-r--r--src/libelogind/sd-utf8/sd-utf8.c (renamed from src/libsystemd/sd-utf8/sd-utf8.c)0
116 files changed, 167 insertions, 201 deletions
diff --git a/Makefile.am b/Makefile.am
index 6586937e3..e973f1923 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,24 @@
# -*- Mode: makefile; indent-tabs-mode: t -*-
#
-# This file is part of systemd.
+# This file is part of elogind.
#
# Copyright 2010-2012 Lennart Poettering
# Copyright 2010-2012 Kay Sievers
# Copyright 2013 Zbigniew Jędrzejewski-Szmek
# Copyright 2013 David Strauss
#
-# systemd is free software; you can redistribute it and/or modify it
+# elogind 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.
#
-# systemd is distributed in the hope that it will be useful, but
+# elogind is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+# along with elogind; If not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
@@ -38,27 +38,9 @@ SUBDIRS = . po
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
-LIBSYSTEMD_CURRENT=6
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=6
-
-# The following four libraries only exist for compatibility reasons,
-# their version info should not be bumped anymore
-LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=3
-LIBSYSTEMD_LOGIN_AGE=9
-
-LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=12
-LIBSYSTEMD_DAEMON_AGE=0
-
-LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=28
-LIBSYSTEMD_ID128_AGE=0
-
-LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=5
-LIBSYSTEMD_JOURNAL_AGE=11
+LIBELOGIND_CURRENT=6
+LIBELOGIND_REVISION=0
+LIBELOGIND_AGE=6
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@ -71,38 +53,38 @@ polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
zshcompletiondir=@zshcompletiondir@
varlogdir=$(localstatedir)/log
-systemdstatedir=$(localstatedir)/lib/systemd
-catalogstatedir=$(systemdstatedir)/catalog
+elogindstatedir=$(localstatedir)/lib/elogind
+catalogstatedir=$(elogindstatedir)/catalog
xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
# Our own, non-special dirs
-pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(prefix)/lib/systemd/user
-userpresetdir=$(prefix)/lib/systemd/user-preset
+pkgsysconfdir=$(sysconfdir)/elogind
+userunitdir=$(prefix)/lib/elogind/user
+userpresetdir=$(prefix)/lib/elogind/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysusersdir=$(prefix)/lib/sysusers.d
sysctldir=$(prefix)/lib/sysctl.d
binfmtdir=$(prefix)/lib/binfmt.d
modulesloaddir=$(prefix)/lib/modules-load.d
-networkdir=$(rootprefix)/lib/systemd/network
-pkgincludedir=$(includedir)/systemd
+networkdir=$(rootprefix)/lib/elogind/network
+pkgincludedir=$(includedir)/elogind
systemgeneratordir=$(rootlibexecdir)/system-generators
-usergeneratordir=$(prefix)/lib/systemd/user-generators
+usergeneratordir=$(prefix)/lib/elogind/user-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
systemsleepdir=$(rootlibexecdir)/system-sleep
-systemunitdir=$(rootprefix)/lib/systemd/system
-systempresetdir=$(rootprefix)/lib/systemd/system-preset
+systemunitdir=$(rootprefix)/lib/elogind/system
+systempresetdir=$(rootprefix)/lib/elogind/system-preset
udevrulesdir=$(rootprefix)/lib/udev/rules.d
-catalogdir=$(prefix)/lib/systemd/catalog
+catalogdir=$(prefix)/lib/elogind/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
factory_etcdir = $(prefix)/share/factory/etc
factory_pamdir = $(prefix)/share/factory/etc/pam.d
-bootlibdir = $(prefix)/lib/systemd/boot/efi
+bootlibdir = $(prefix)/lib/elogind/boot/efi
# And these are the special ones for /
rootprefix=@rootprefix@
rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/systemd
+rootlibexecdir=$(rootprefix)/lib/elogind
EXTRA_DIST =
BUILT_SOURCES =
@@ -170,14 +152,14 @@ AM_CPPFLAGS = \
-DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
-DROOTPREFIX=\"$(rootprefix)\" \
- -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \
- -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
+ -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/elogind/\" \
+ -DRANDOM_SEED=\"$(localstatedir)/lib/elogind/random-seed\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
- -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
- -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
+ -DELOGIND_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+ -DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
-DX_SERVER=\"$(bindir)/X\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-DQUOTACHECK=\"$(QUOTACHECK)\" \
@@ -193,9 +175,9 @@ AM_CPPFLAGS = \
-I $(top_srcdir)/src/systemd \
-I $(top_builddir)/src/core \
-I $(top_srcdir)/src/core \
- -I $(top_srcdir)/src/libsystemd/sd-bus \
- -I $(top_srcdir)/src/libsystemd/sd-event \
- -I $(top_srcdir)/src/libsystemd/sd-device \
+ -I $(top_srcdir)/src/libelogind/sd-bus \
+ -I $(top_srcdir)/src/libelogind/sd-event \
+ -I $(top_srcdir)/src/libelogind/sd-device \
$(UDEV_CFLAGS) \
$(OUR_CPPFLAGS)
@@ -336,9 +318,9 @@ dist_doc_DATA = \
LICENSE.LGPL2.1 \
LICENSE.GPL2 \
LICENSE.MIT \
- src/libsystemd/sd-bus/PORTING-DBUS1 \
- src/libsystemd/sd-bus/DIFFERENCES \
- src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+ src/libelogind/sd-bus/PORTING-DBUS1 \
+ src/libelogind/sd-bus/DIFFERENCES \
+ src/libelogind/sd-bus/GVARIANT-SERIALIZATION
@INTLTOOL_POLICY_RULE@
@@ -396,9 +378,9 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-shared.la
+ libelogind-shared.la
-libsystemd_shared_la_SOURCES = \
+libelogind_shared_la_SOURCES = \
src/shared/capability.c \
src/shared/capability.h \
src/shared/linux/auto_dev-ioctl.h \
@@ -563,7 +545,7 @@ libsystemd_shared_la_SOURCES = \
src/shared/sysctl-util.c \
src/shared/sysctl-util.h
-nodist_libsystemd_shared_la_SOURCES = \
+nodist_libelogind_shared_la_SOURCES = \
src/shared/errno-from-name.h \
src/shared/errno-to-name.h \
src/shared/af-from-name.h \
@@ -573,38 +555,38 @@ nodist_libsystemd_shared_la_SOURCES = \
src/shared/cap-from-name.h \
src/shared/cap-to-name.h
-libsystemd_shared_la_CFLAGS = \
+libelogind_shared_la_CFLAGS = \
$(AM_CFLAGS) \
$(CAP_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
-libsystemd_shared_la_LIBADD = \
+libelogind_shared_la_LIBADD = \
$(CAP_LIBS) \
-lm
# ------------------------------------------------------------------------------
if HAVE_ACL
noinst_LTLIBRARIES += \
- libsystemd-acl.la
+ libelogind-acl.la
-libsystemd_acl_la_SOURCES = \
+libelogind_acl_la_SOURCES = \
src/shared/acl-util.c \
src/shared/acl-util.h
-libsystemd_acl_la_CFLAGS = \
+libelogind_acl_la_CFLAGS = \
$(AM_CFLAGS) \
$(ACL_CFLAGS)
-libsystemd_acl_la_LIBADD = \
+libelogind_acl_la_LIBADD = \
$(ACL_LIBS)
endif
# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-core.la
+#noinst_LTLIBRARIES += \
+# elogind-core.la
-libsystemd_core_la_SOURCES = \
+elogind_core_la_SOURCES = \
src/core/unit.c \
src/core/unit.h \
src/core/unit-printf.c \
@@ -714,17 +696,17 @@ libsystemd_core_la_SOURCES = \
src/core/failure-action.c \
src/core/failure-action.h
-nodist_libsystemd_core_la_SOURCES = \
+nodist_elogind_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c
-libsystemd_core_la_CFLAGS = \
+elogind_core_la_CFLAGS = \
$(AM_CFLAGS) \
$(PAM_CFLAGS) \
-pthread
-libsystemd_core_la_LIBADD = \
- libsystemd-shared.la \
+elogind_core_la_LIBADD = \
+ libelogind-shared.la \
$(PAM_LIBS)
src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
@@ -819,9 +801,9 @@ endif
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-internal.la
+ libelogind-internal.la
-libsystemd_internal_la_SOURCES = \
+libelogind_internal_la_SOURCES = \
src/systemd/sd-bus.h \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
@@ -835,120 +817,120 @@ libsystemd_internal_la_SOURCES = \
src/systemd/sd-path.h \
src/systemd/sd-network.h \
src/systemd/sd-device.h \
- src/libsystemd/sd-bus/sd-bus.c \
- src/libsystemd/sd-bus/bus-control.c \
- src/libsystemd/sd-bus/bus-control.h \
- src/libsystemd/sd-bus/bus-error.c \
- src/libsystemd/sd-bus/bus-error.h \
- src/libsystemd/sd-bus/bus-common-errors.h \
- src/libsystemd/sd-bus/bus-common-errors.c \
- src/libsystemd/sd-bus/bus-internal.c \
- src/libsystemd/sd-bus/bus-internal.h \
- src/libsystemd/sd-bus/bus-socket.c \
- src/libsystemd/sd-bus/bus-socket.h \
- src/libsystemd/sd-bus/bus-kernel.c \
- src/libsystemd/sd-bus/bus-kernel.h \
- src/libsystemd/sd-bus/bus-container.c \
- src/libsystemd/sd-bus/bus-container.h \
- src/libsystemd/sd-bus/bus-message.c \
- src/libsystemd/sd-bus/bus-message.h \
- src/libsystemd/sd-bus/bus-creds.c \
- src/libsystemd/sd-bus/bus-creds.h \
- src/libsystemd/sd-bus/bus-signature.c \
- src/libsystemd/sd-bus/bus-signature.h \
- src/libsystemd/sd-bus/bus-type.c \
- src/libsystemd/sd-bus/bus-type.h \
- src/libsystemd/sd-bus/bus-match.c \
- src/libsystemd/sd-bus/bus-match.h \
- src/libsystemd/sd-bus/bus-bloom.c \
- src/libsystemd/sd-bus/bus-bloom.h \
- src/libsystemd/sd-bus/bus-introspect.c \
- src/libsystemd/sd-bus/bus-introspect.h \
- src/libsystemd/sd-bus/bus-objects.c \
- src/libsystemd/sd-bus/bus-objects.h \
- src/libsystemd/sd-bus/bus-gvariant.c \
- src/libsystemd/sd-bus/bus-gvariant.h \
- src/libsystemd/sd-bus/bus-convenience.c \
- src/libsystemd/sd-bus/bus-track.c \
- src/libsystemd/sd-bus/bus-track.h \
- src/libsystemd/sd-bus/bus-util.c \
- src/libsystemd/sd-bus/bus-util.h \
- src/libsystemd/sd-bus/bus-slot.c \
- src/libsystemd/sd-bus/bus-slot.h \
- src/libsystemd/sd-bus/bus-protocol.h \
- src/libsystemd/sd-bus/kdbus.h \
- src/libsystemd/sd-utf8/sd-utf8.c \
- src/libsystemd/sd-event/sd-event.c \
- src/libsystemd/sd-event/event-util.h \
- src/libsystemd/sd-rtnl/sd-rtnl.c \
- src/libsystemd/sd-rtnl/rtnl-internal.h \
- src/libsystemd/sd-rtnl/rtnl-message.c \
- src/libsystemd/sd-rtnl/rtnl-types.h \
- src/libsystemd/sd-rtnl/rtnl-types.c \
- src/libsystemd/sd-rtnl/rtnl-util.h \
- src/libsystemd/sd-rtnl/rtnl-util.c \
- src/libsystemd/sd-rtnl/local-addresses.h \
- src/libsystemd/sd-rtnl/local-addresses.c \
- src/libsystemd/sd-id128/sd-id128.c \
- src/libsystemd/sd-daemon/sd-daemon.c \
- src/libsystemd/sd-login/sd-login.c \
- src/libsystemd/sd-path/sd-path.c \
- src/libsystemd/sd-network/sd-network.c \
- src/libsystemd/sd-network/network-util.h \
- src/libsystemd/sd-network/network-util.c \
- src/libsystemd/sd-device/device-internal.h \
- src/libsystemd/sd-device/device-util.h \
- src/libsystemd/sd-device/sd-device.c \
- src/libsystemd/sd-device/device-private.c \
- src/libsystemd/sd-device/device-private.h
-
-nodist_libsystemd_internal_la_SOURCES = \
- src/libsystemd/libsystemd.sym
-
-libsystemd_internal_la_CFLAGS = \
+ src/libelogind/sd-bus/sd-bus.c \
+ src/libelogind/sd-bus/bus-control.c \
+ src/libelogind/sd-bus/bus-control.h \
+ src/libelogind/sd-bus/bus-error.c \
+ src/libelogind/sd-bus/bus-error.h \
+ src/libelogind/sd-bus/bus-common-errors.h \
+ src/libelogind/sd-bus/bus-common-errors.c \
+ src/libelogind/sd-bus/bus-internal.c \
+ src/libelogind/sd-bus/bus-internal.h \
+ src/libelogind/sd-bus/bus-socket.c \
+ src/libelogind/sd-bus/bus-socket.h \
+ src/libelogind/sd-bus/bus-kernel.c \
+ src/libelogind/sd-bus/bus-kernel.h \
+ src/libelogind/sd-bus/bus-container.c \
+ src/libelogind/sd-bus/bus-container.h \
+ src/libelogind/sd-bus/bus-message.c \
+ src/libelogind/sd-bus/bus-message.h \
+ src/libelogind/sd-bus/bus-creds.c \
+ src/libelogind/sd-bus/bus-creds.h \
+ src/libelogind/sd-bus/bus-signature.c \
+ src/libelogind/sd-bus/bus-signature.h \
+ src/libelogind/sd-bus/bus-type.c \
+ src/libelogind/sd-bus/bus-type.h \
+ src/libelogind/sd-bus/bus-match.c \
+ src/libelogind/sd-bus/bus-match.h \
+ src/libelogind/sd-bus/bus-bloom.c \
+ src/libelogind/sd-bus/bus-bloom.h \
+ src/libelogind/sd-bus/bus-introspect.c \
+ src/libelogind/sd-bus/bus-introspect.h \
+ src/libelogind/sd-bus/bus-objects.c \
+ src/libelogind/sd-bus/bus-objects.h \
+ src/libelogind/sd-bus/bus-gvariant.c \
+ src/libelogind/sd-bus/bus-gvariant.h \
+ src/libelogind/sd-bus/bus-convenience.c \
+ src/libelogind/sd-bus/bus-track.c \
+ src/libelogind/sd-bus/bus-track.h \
+ src/libelogind/sd-bus/bus-util.c \
+ src/libelogind/sd-bus/bus-util.h \
+ src/libelogind/sd-bus/bus-slot.c \
+ src/libelogind/sd-bus/bus-slot.h \
+ src/libelogind/sd-bus/bus-protocol.h \
+ src/libelogind/sd-bus/kdbus.h \
+ src/libelogind/sd-utf8/sd-utf8.c \
+ src/libelogind/sd-event/sd-event.c \
+ src/libelogind/sd-event/event-util.h \
+ src/libelogind/sd-rtnl/sd-rtnl.c \
+ src/libelogind/sd-rtnl/rtnl-internal.h \
+ src/libelogind/sd-rtnl/rtnl-message.c \
+ src/libelogind/sd-rtnl/rtnl-types.h \
+ src/libelogind/sd-rtnl/rtnl-types.c \
+ src/libelogind/sd-rtnl/rtnl-util.h \
+ src/libelogind/sd-rtnl/rtnl-util.c \
+ src/libelogind/sd-rtnl/local-addresses.h \
+ src/libelogind/sd-rtnl/local-addresses.c \
+ src/libelogind/sd-id128/sd-id128.c \
+ src/libelogind/sd-daemon/sd-daemon.c \
+ src/libelogind/sd-login/sd-login.c \
+ src/libelogind/sd-path/sd-path.c \
+ src/libelogind/sd-network/sd-network.c \
+ src/libelogind/sd-network/network-util.h \
+ src/libelogind/sd-network/network-util.c \
+ src/libelogind/sd-device/device-internal.h \
+ src/libelogind/sd-device/device-util.h \
+ src/libelogind/sd-device/sd-device.c \
+ src/libelogind/sd-device/device-private.c \
+ src/libelogind/sd-device/device-private.h
+
+nodist_libelogind_internal_la_SOURCES = \
+ src/libelogind/libelogind.sym
+
+libelogind_internal_la_CFLAGS = \
$(AM_CFLAGS) \
-pthread
BUILT_SOURCES += \
- src/libsystemd/libsystemd.sym
+ src/libelogind/libelogind.sym
-libsystemd_internal_la_LIBADD = \
+libelogind_internal_la_LIBADD = \
$(RT_LIBS) \
- libsystemd-shared.la
+ libelogind-shared.la
-libsystemd_internal_la_LDFLAGS = \
+libelogind_internal_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
- -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
+ -version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \
+ -Wl,--version-script=$(top_builddir)/src/libelogind/libelogind.sym
-libsystemd-install-hook:
- libname=libsystemd.so && $(move-to-rootlibdir)
+libelogind-install-hook:
+ libname=libelogind.so && $(move-to-rootlibdir)
-libsystemd-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+libelogind-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
-INSTALL_EXEC_HOOKS += libsystemd-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+INSTALL_EXEC_HOOKS += libelogind-install-hook
+UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
pkgconfiglib_DATA += \
- src/libsystemd/libsystemd.pc
+ src/libelogind/libsystemd.pc
pkginclude_HEADERS += \
src/systemd/sd-login.h
# ------------------------------------------------------------------------------
-systemd_logind_SOURCES = \
+elogind_SOURCES = \
src/login/logind.c \
src/login/logind.h
-nodist_systemd_logind_SOURCES = \
+nodist_elogind_SOURCES = \
src/login/logind-gperf.c
-systemd_logind_LDADD = \
- libsystemd-logind-core.la
+elogind_LDADD = \
+ libelogind-core.la
-libsystemd_logind_core_la_SOURCES = \
+libelogind_core_la_SOURCES = \
src/login/logind-core.c \
src/login/logind-device.c \
src/login/logind-device.h \
@@ -972,23 +954,23 @@ libsystemd_logind_core_la_SOURCES = \
src/login/logind-user-dbus.c \
src/login/logind-acl.h
-libsystemd_logind_core_la_LIBADD = \
+libelogind_core_la_LIBADD = \
$(UDEV_LIBS) \
- libsystemd-internal.la
+ libelogind-internal.la
if HAVE_ACL
-libsystemd_logind_core_la_SOURCES += \
+libelogind_core_la_SOURCES += \
src/login/logind-acl.c
-libsystemd_logind_core_la_LIBADD += \
- libsystemd-acl.la
+libelogind_core_la_LIBADD += \
+ libelogind-acl.la
endif
noinst_LTLIBRARIES += \
- libsystemd-logind-core.la
+ libelogind-core.la
rootlibexec_PROGRAMS += \
- systemd-logind
+ elogind
loginctl_SOURCES = \
src/login/loginctl.c \
@@ -997,8 +979,8 @@ loginctl_SOURCES = \
loginctl_LDADD = \
$(UDEV_LIBS) \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libelogind-internal.la \
+ libelogind-shared.la
rootbin_PROGRAMS += \
loginctl
@@ -1014,38 +996,38 @@ systemd_inhibit_SOURCES = \
src/login/inhibit.c
systemd_inhibit_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libelogind-internal.la \
+ libelogind-shared.la
rootbin_PROGRAMS += \
systemd-inhibit
test_login_SOURCES = \
- src/libsystemd/sd-login/test-login.c
+ src/libelogind/sd-login/test-login.c
test_login_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libelogind-internal.la \
+ libelogind-shared.la
test_login_shared_SOURCES = \
src/login/test-login-shared.c
test_login_shared_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libelogind-internal.la \
+ libelogind-shared.la
test_inhibit_SOURCES = \
src/login/test-inhibit.c
test_inhibit_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libelogind-internal.la \
+ libelogind-shared.la
test_login_tables_SOURCES = \
src/login/test-login-tables.c
test_login_tables_LDADD = \
- libsystemd-logind-core.la
+ libelogind-core.la
manual_tests += \
test-login \
@@ -1074,14 +1056,14 @@ pam_elogind_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
pam_elogind_la_LIBADD = \
- libsystemd-internal.la \
+ libelogind-internal.la \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
pam_elogind.la
dist_pamconf_DATA = \
- src/login/systemd-user
+ src/login/elogind-user
endif
@@ -1098,10 +1080,10 @@ polkitpolicy_files += \
src/login/org.freedesktop.login1.policy
INSTALL_DIRS += \
- $(systemdstatedir)
+ $(elogindstatedir)
SYSTEM_UNIT_ALIASES += \
- systemd-logind.service dbus-org.freedesktop.login1.service
+ elogind.service dbus-org.freedesktop.login1.service
dist_udevrules_DATA = \
src/login/70-uaccess.rules \
@@ -1119,22 +1101,13 @@ gperf_gperf_sources = \
EXTRA_DIST += \
src/login/71-seat.rules.in \
- src/login/73-seat-late.rules.in \
- units/systemd-logind.service.in
-
-pkgconfiglib_DATA += \
- src/compat-libs/libsystemd-login.pc
-
-EXTRA_DIST += \
- src/compat-libs/libsystemd-login.pc.in
+ src/login/73-seat-late.rules.in
# ------------------------------------------------------------------------------
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
- '|SYSTEMCTL=$(rootbindir)/systemctl|' \
- '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
'|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \
'|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \
@@ -1154,8 +1127,8 @@ substitutions = \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
- '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \
- '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
+ '|RANDOM_SEED_DIR=$(localstatedir)/lib/elogind/|' \
+ '|RANDOM_SEED=$(localstatedir)/lib/elogind/random-seed|' \
'|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \
'|libdir=$(libdir)|' \
@@ -1279,7 +1252,7 @@ XSLTPROC_FLAGS = \
--stringparam funcsynopsis.style ansi \
--stringparam man.authors.section.enabled 0 \
--stringparam man.copyright.section.enabled 0 \
- --stringparam systemd.version $(VERSION) \
+ --stringparam elogind.version $(VERSION) \
--path '$(builddir)/man:$(srcdir)/man'
XSLTPROC_PROCESS_MAN = \
@@ -1337,8 +1310,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr \
- --enable-kdbus \
- --enable-compat-libs
+ --enable-kdbus
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path= \
@@ -1352,13 +1324,7 @@ endif
#
# Require python when making dist
#
-.PHONY: dist-check-compat-libs dist-check-help
-
-dist-check-compat-libs:
-if !ENABLE_COMPAT_LIBS
- @echo "*** compat-libs must be enabled in order to make dist"
- @false
-endif
+.PHONY: dist-check-help
dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
for i in $(abspath $^); do \
@@ -1368,4 +1334,4 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
exit 1; \
fi; done
-dist: dist-check-python dist-check-compat-libs
+dist: dist-check-python
diff --git a/src/libsystemd/.gitignore b/src/libelogind/.gitignore
index d48e1cdd1..d48e1cdd1 100644
--- a/src/libsystemd/.gitignore
+++ b/src/libelogind/.gitignore
diff --git a/src/libsystemd/Makefile b/src/libelogind/Makefile
index d0b0e8e00..d0b0e8e00 120000
--- a/src/libsystemd/Makefile
+++ b/src/libelogind/Makefile
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libelogind/libelogind.sym.m4
index 81f112269..81f112269 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libelogind/libelogind.sym.m4
diff --git a/src/libsystemd/libsystemd.pc.in b/src/libelogind/libsystemd.pc.in
index e8f79507e..e8f79507e 100644
--- a/src/libsystemd/libsystemd.pc.in
+++ b/src/libelogind/libsystemd.pc.in
diff --git a/src/libsystemd/sd-bus/DIFFERENCES b/src/libelogind/sd-bus/DIFFERENCES
index db269675a..db269675a 100644
--- a/src/libsystemd/sd-bus/DIFFERENCES
+++ b/src/libelogind/sd-bus/DIFFERENCES
diff --git a/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION b/src/libelogind/sd-bus/GVARIANT-SERIALIZATION
index 859e2715f..859e2715f 100644
--- a/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+++ b/src/libelogind/sd-bus/GVARIANT-SERIALIZATION
diff --git a/src/libsystemd/sd-bus/Makefile b/src/libelogind/sd-bus/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-bus/Makefile
+++ b/src/libelogind/sd-bus/Makefile
diff --git a/src/libsystemd/sd-bus/PORTING-DBUS1 b/src/libelogind/sd-bus/PORTING-DBUS1
index 2dedb28bc..2dedb28bc 100644
--- a/src/libsystemd/sd-bus/PORTING-DBUS1
+++ b/src/libelogind/sd-bus/PORTING-DBUS1
diff --git a/src/libsystemd/sd-bus/bus-bloom.c b/src/libelogind/sd-bus/bus-bloom.c
index 355677407..355677407 100644
--- a/src/libsystemd/sd-bus/bus-bloom.c
+++ b/src/libelogind/sd-bus/bus-bloom.c
diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libelogind/sd-bus/bus-bloom.h
index a9350d7f5..a9350d7f5 100644
--- a/src/libsystemd/sd-bus/bus-bloom.h
+++ b/src/libelogind/sd-bus/bus-bloom.h
diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libelogind/sd-bus/bus-common-errors.c
index 52f8dfd3b..52f8dfd3b 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.c
+++ b/src/libelogind/sd-bus/bus-common-errors.c
diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libelogind/sd-bus/bus-common-errors.h
index b17b62ac9..b17b62ac9 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.h
+++ b/src/libelogind/sd-bus/bus-common-errors.h
diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libelogind/sd-bus/bus-container.c
index 3b3a5d357..3b3a5d357 100644
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libelogind/sd-bus/bus-container.c
diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libelogind/sd-bus/bus-container.h
index c6f757a99..c6f757a99 100644
--- a/src/libsystemd/sd-bus/bus-container.h
+++ b/src/libelogind/sd-bus/bus-container.h
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libelogind/sd-bus/bus-control.c
index 25510f00c..25510f00c 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libelogind/sd-bus/bus-control.c
diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libelogind/sd-bus/bus-control.h
index 5009ca8e6..5009ca8e6 100644
--- a/src/libsystemd/sd-bus/bus-control.h
+++ b/src/libelogind/sd-bus/bus-control.h
diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libelogind/sd-bus/bus-convenience.c
index a6317e978..a6317e978 100644
--- a/src/libsystemd/sd-bus/bus-convenience.c
+++ b/src/libelogind/sd-bus/bus-convenience.c
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libelogind/sd-bus/bus-creds.c
index cd1c5e232..cd1c5e232 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libelogind/sd-bus/bus-creds.c
diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libelogind/sd-bus/bus-creds.h
index 5430e535f..5430e535f 100644
--- a/src/libsystemd/sd-bus/bus-creds.h
+++ b/src/libelogind/sd-bus/bus-creds.h
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libelogind/sd-bus/bus-dump.c
index 4bc896549..4bc896549 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libelogind/sd-bus/bus-dump.c
diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libelogind/sd-bus/bus-dump.h
index d2522edeb..d2522edeb 100644
--- a/src/libsystemd/sd-bus/bus-dump.h
+++ b/src/libelogind/sd-bus/bus-dump.h
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libelogind/sd-bus/bus-error.c
index dac157be1..dac157be1 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libelogind/sd-bus/bus-error.c
diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libelogind/sd-bus/bus-error.h
index fb0199c94..fb0199c94 100644
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libelogind/sd-bus/bus-error.h
diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libelogind/sd-bus/bus-gvariant.c
index 2d18a4e6c..2d18a4e6c 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.c
+++ b/src/libelogind/sd-bus/bus-gvariant.c
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libelogind/sd-bus/bus-gvariant.h
index 875d34b59..875d34b59 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libelogind/sd-bus/bus-gvariant.h
diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libelogind/sd-bus/bus-internal.c
index 91b288cd2..91b288cd2 100644
--- a/src/libsystemd/sd-bus/bus-internal.c
+++ b/src/libelogind/sd-bus/bus-internal.c
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libelogind/sd-bus/bus-internal.h
index 1351938c8..1351938c8 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libelogind/sd-bus/bus-internal.h
diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libelogind/sd-bus/bus-introspect.c
index e2f4550c7..e2f4550c7 100644
--- a/src/libsystemd/sd-bus/bus-introspect.c
+++ b/src/libelogind/sd-bus/bus-introspect.c
diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libelogind/sd-bus/bus-introspect.h
index 1914e6cb8..1914e6cb8 100644
--- a/src/libsystemd/sd-bus/bus-introspect.h
+++ b/src/libelogind/sd-bus/bus-introspect.h
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libelogind/sd-bus/bus-kernel.c
index 35c2aa6be..35c2aa6be 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libelogind/sd-bus/bus-kernel.c
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libelogind/sd-bus/bus-kernel.h
index b9f31ba79..b9f31ba79 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libelogind/sd-bus/bus-kernel.h
diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libelogind/sd-bus/bus-match.c
index a9e944c94..a9e944c94 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libelogind/sd-bus/bus-match.c
diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libelogind/sd-bus/bus-match.h
index af5f65d07..af5f65d07 100644
--- a/src/libsystemd/sd-bus/bus-match.h
+++ b/src/libelogind/sd-bus/bus-match.h
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c
index 70c38cf48..70c38cf48 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libelogind/sd-bus/bus-message.c
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libelogind/sd-bus/bus-message.h
index d784e603d..d784e603d 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libelogind/sd-bus/bus-message.h
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libelogind/sd-bus/bus-objects.c
index fc6c22328..fc6c22328 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libelogind/sd-bus/bus-objects.c
diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libelogind/sd-bus/bus-objects.h
index 4373fae89..4373fae89 100644
--- a/src/libsystemd/sd-bus/bus-objects.h
+++ b/src/libelogind/sd-bus/bus-objects.h
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libelogind/sd-bus/bus-protocol.h
index 183af89a6..183af89a6 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libelogind/sd-bus/bus-protocol.h
diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libelogind/sd-bus/bus-signature.c
index 1e5bf4821..1e5bf4821 100644
--- a/src/libsystemd/sd-bus/bus-signature.c
+++ b/src/libelogind/sd-bus/bus-signature.c
diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libelogind/sd-bus/bus-signature.h
index c4fed0b53..c4fed0b53 100644
--- a/src/libsystemd/sd-bus/bus-signature.h
+++ b/src/libelogind/sd-bus/bus-signature.h
diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libelogind/sd-bus/bus-slot.c
index 8060e9882..8060e9882 100644
--- a/src/libsystemd/sd-bus/bus-slot.c
+++ b/src/libelogind/sd-bus/bus-slot.c
diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libelogind/sd-bus/bus-slot.h
index 23a15e4d0..23a15e4d0 100644
--- a/src/libsystemd/sd-bus/bus-slot.h
+++ b/src/libelogind/sd-bus/bus-slot.h
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libelogind/sd-bus/bus-socket.c
index 873aede65..873aede65 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libelogind/sd-bus/bus-socket.c
diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libelogind/sd-bus/bus-socket.h
index 5a1c7d4cf..5a1c7d4cf 100644
--- a/src/libsystemd/sd-bus/bus-socket.h
+++ b/src/libelogind/sd-bus/bus-socket.h
diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libelogind/sd-bus/bus-track.c
index 048178550..048178550 100644
--- a/src/libsystemd/sd-bus/bus-track.c
+++ b/src/libelogind/sd-bus/bus-track.c
diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libelogind/sd-bus/bus-track.h
index f8690a523..f8690a523 100644
--- a/src/libsystemd/sd-bus/bus-track.h
+++ b/src/libelogind/sd-bus/bus-track.h
diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libelogind/sd-bus/bus-type.c
index 6bc7b880a..6bc7b880a 100644
--- a/src/libsystemd/sd-bus/bus-type.c
+++ b/src/libelogind/sd-bus/bus-type.c
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libelogind/sd-bus/bus-type.h
index 581574ab7..581574ab7 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libelogind/sd-bus/bus-type.h
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libelogind/sd-bus/bus-util.c
index dcad70198..dcad70198 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libelogind/sd-bus/bus-util.c
diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libelogind/sd-bus/bus-util.h
index 9f048711d..9f048711d 100644
--- a/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libelogind/sd-bus/bus-util.h
diff --git a/src/libsystemd/sd-bus/busctl-introspect.c b/src/libelogind/sd-bus/busctl-introspect.c
index 15c10da7e..15c10da7e 100644
--- a/src/libsystemd/sd-bus/busctl-introspect.c
+++ b/src/libelogind/sd-bus/busctl-introspect.c
diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/libelogind/sd-bus/busctl-introspect.h
index ea807d597..ea807d597 100644
--- a/src/libsystemd/sd-bus/busctl-introspect.h
+++ b/src/libelogind/sd-bus/busctl-introspect.h
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libelogind/sd-bus/busctl.c
index d52dbdfd8..d52dbdfd8 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libelogind/sd-bus/busctl.c
diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libelogind/sd-bus/kdbus.h
index fc1d77dd7..fc1d77dd7 100644
--- a/src/libsystemd/sd-bus/kdbus.h
+++ b/src/libelogind/sd-bus/kdbus.h
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 2cb1aafa2..2cb1aafa2 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libelogind/sd-bus/test-bus-chat.c
index 7f49fe90f..7f49fe90f 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libelogind/sd-bus/test-bus-chat.c
diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libelogind/sd-bus/test-bus-cleanup.c
index f58688059..f58688059 100644
--- a/src/libsystemd/sd-bus/test-bus-cleanup.c
+++ b/src/libelogind/sd-bus/test-bus-cleanup.c
diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libelogind/sd-bus/test-bus-creds.c
index edd5033db..edd5033db 100644
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libelogind/sd-bus/test-bus-creds.c
diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libelogind/sd-bus/test-bus-error.c
index 5753c04b0..5753c04b0 100644
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libelogind/sd-bus/test-bus-error.c
diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libelogind/sd-bus/test-bus-gvariant.c
index 992edacb2..992edacb2 100644
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libelogind/sd-bus/test-bus-gvariant.c
diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libelogind/sd-bus/test-bus-introspect.c
index b2caa0287..b2caa0287 100644
--- a/src/libsystemd/sd-bus/test-bus-introspect.c
+++ b/src/libelogind/sd-bus/test-bus-introspect.c
diff --git a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c b/src/libelogind/sd-bus/test-bus-kernel-benchmark.c
index f480b655d..f480b655d 100644
--- a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
+++ b/src/libelogind/sd-bus/test-bus-kernel-benchmark.c
diff --git a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c b/src/libelogind/sd-bus/test-bus-kernel-bloom.c
index b11c43bd7..b11c43bd7 100644
--- a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c
+++ b/src/libelogind/sd-bus/test-bus-kernel-bloom.c
diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libelogind/sd-bus/test-bus-kernel.c
index 8f4f60b65..8f4f60b65 100644
--- a/src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/src/libelogind/sd-bus/test-bus-kernel.c
diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libelogind/sd-bus/test-bus-marshal.c
index 7569ff98b..7569ff98b 100644
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libelogind/sd-bus/test-bus-marshal.c
diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libelogind/sd-bus/test-bus-match.c
index 051969f9c..051969f9c 100644
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libelogind/sd-bus/test-bus-match.c
diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libelogind/sd-bus/test-bus-objects.c
index 895eda4ea..895eda4ea 100644
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libelogind/sd-bus/test-bus-objects.c
diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libelogind/sd-bus/test-bus-server.c
index 080d8eddb..080d8eddb 100644
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libelogind/sd-bus/test-bus-server.c
diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libelogind/sd-bus/test-bus-signature.c
index 4165c9273..4165c9273 100644
--- a/src/libsystemd/sd-bus/test-bus-signature.c
+++ b/src/libelogind/sd-bus/test-bus-signature.c
diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libelogind/sd-bus/test-bus-zero-copy.c
index 2d062fc9b..2d062fc9b 100644
--- a/src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/src/libelogind/sd-bus/test-bus-zero-copy.c
diff --git a/src/libsystemd/sd-daemon/Makefile b/src/libelogind/sd-daemon/Makefile
index d0b0e8e00..d0b0e8e00 120000
--- a/src/libsystemd/sd-daemon/Makefile
+++ b/src/libelogind/sd-daemon/Makefile
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 82ac72c72..82ac72c72 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libelogind/sd-device/device-internal.h
index 59ec1a6d7..59ec1a6d7 100644
--- a/src/libsystemd/sd-device/device-internal.h
+++ b/src/libelogind/sd-device/device-internal.h
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libelogind/sd-device/device-private.c
index 81b0b6dde..81b0b6dde 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libelogind/sd-device/device-private.c
diff --git a/src/libsystemd/sd-device/device-private.h b/src/libelogind/sd-device/device-private.h
index 7c6219ca6..7c6219ca6 100644
--- a/src/libsystemd/sd-device/device-private.h
+++ b/src/libelogind/sd-device/device-private.h
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libelogind/sd-device/device-util.h
index bfbb3284a..bfbb3284a 100644
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libelogind/sd-device/device-util.h
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libelogind/sd-device/sd-device.c
index 0dd0e14ee..0dd0e14ee 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libelogind/sd-device/sd-device.c
diff --git a/src/libsystemd/sd-event/Makefile b/src/libelogind/sd-event/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-event/Makefile
+++ b/src/libelogind/sd-event/Makefile
diff --git a/src/libsystemd/sd-event/event-util.h b/src/libelogind/sd-event/event-util.h
index e7cad9be4..e7cad9be4 100644
--- a/src/libsystemd/sd-event/event-util.h
+++ b/src/libelogind/sd-event/event-util.h
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c
index 376477f27..376477f27 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libelogind/sd-event/sd-event.c
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libelogind/sd-event/test-event.c
index 721700be7..721700be7 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libelogind/sd-event/test-event.c
diff --git a/src/libsystemd/sd-hwdb/Makefile b/src/libelogind/sd-hwdb/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-hwdb/Makefile
+++ b/src/libelogind/sd-hwdb/Makefile
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libelogind/sd-hwdb/hwdb-internal.h
index fedccdec7..fedccdec7 100644
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libelogind/sd-hwdb/hwdb-internal.h
diff --git a/src/libsystemd/sd-hwdb/hwdb-util.h b/src/libelogind/sd-hwdb/hwdb-util.h
index ee020a294..ee020a294 100644
--- a/src/libsystemd/sd-hwdb/hwdb-util.h
+++ b/src/libelogind/sd-hwdb/hwdb-util.h
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libelogind/sd-hwdb/sd-hwdb.c
index 3bbf02896..3bbf02896 100644
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libelogind/sd-hwdb/sd-hwdb.c
diff --git a/src/libsystemd/sd-id128/Makefile b/src/libelogind/sd-id128/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-id128/Makefile
+++ b/src/libelogind/sd-id128/Makefile
diff --git a/src/libsystemd/sd-id128/libsystemd-id128.pc.in b/src/libelogind/sd-id128/libsystemd-id128.pc.in
index bb65ffde3..bb65ffde3 100644
--- a/src/libsystemd/sd-id128/libsystemd-id128.pc.in
+++ b/src/libelogind/sd-id128/libsystemd-id128.pc.in
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libelogind/sd-id128/sd-id128.c
index f0ffedc38..f0ffedc38 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libelogind/sd-id128/sd-id128.c
diff --git a/src/libsystemd/sd-login/Makefile b/src/libelogind/sd-login/Makefile
index d0b0e8e00..d0b0e8e00 120000
--- a/src/libsystemd/sd-login/Makefile
+++ b/src/libelogind/sd-login/Makefile
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libelogind/sd-login/sd-login.c
index cc0677bdf..cc0677bdf 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libelogind/sd-login/sd-login.c
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libelogind/sd-login/test-login.c
index 2802e8246..2802e8246 100644
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libelogind/sd-login/test-login.c
diff --git a/src/libsystemd/sd-network/Makefile b/src/libelogind/sd-network/Makefile
index d0b0e8e00..d0b0e8e00 120000
--- a/src/libsystemd/sd-network/Makefile
+++ b/src/libelogind/sd-network/Makefile
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libelogind/sd-network/network-util.c
index 48958e8a9..48958e8a9 100644
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libelogind/sd-network/network-util.c
diff --git a/src/libsystemd/sd-network/network-util.h b/src/libelogind/sd-network/network-util.h
index 11a001234..11a001234 100644
--- a/src/libsystemd/sd-network/network-util.h
+++ b/src/libelogind/sd-network/network-util.h
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libelogind/sd-network/sd-network.c
index db1f6997c..db1f6997c 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libelogind/sd-network/sd-network.c
diff --git a/src/libsystemd/sd-path/Makefile b/src/libelogind/sd-path/Makefile
index d0b0e8e00..d0b0e8e00 120000
--- a/src/libsystemd/sd-path/Makefile
+++ b/src/libelogind/sd-path/Makefile
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libelogind/sd-path/sd-path.c
index 7363be279..7363be279 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libelogind/sd-path/sd-path.c
diff --git a/src/libsystemd/sd-resolve/Makefile b/src/libelogind/sd-resolve/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-resolve/Makefile
+++ b/src/libelogind/sd-resolve/Makefile
diff --git a/src/libsystemd/sd-resolve/resolve-util.h b/src/libelogind/sd-resolve/resolve-util.h
index 019cdaffe..019cdaffe 100644
--- a/src/libsystemd/sd-resolve/resolve-util.h
+++ b/src/libelogind/sd-resolve/resolve-util.h
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libelogind/sd-resolve/sd-resolve.c
index b0dc82259..b0dc82259 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libelogind/sd-resolve/sd-resolve.c
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libelogind/sd-resolve/test-resolve.c
index 354a4071b..354a4071b 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libelogind/sd-resolve/test-resolve.c
diff --git a/src/libsystemd/sd-rtnl/Makefile b/src/libelogind/sd-rtnl/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-rtnl/Makefile
+++ b/src/libelogind/sd-rtnl/Makefile
diff --git a/src/libsystemd/sd-rtnl/local-addresses.c b/src/libelogind/sd-rtnl/local-addresses.c
index 31bfa0606..31bfa0606 100644
--- a/src/libsystemd/sd-rtnl/local-addresses.c
+++ b/src/libelogind/sd-rtnl/local-addresses.c
diff --git a/src/libsystemd/sd-rtnl/local-addresses.h b/src/libelogind/sd-rtnl/local-addresses.h
index bdc28d351..bdc28d351 100644
--- a/src/libsystemd/sd-rtnl/local-addresses.h
+++ b/src/libelogind/sd-rtnl/local-addresses.h
diff --git a/src/libsystemd/sd-rtnl/rtnl-internal.h b/src/libelogind/sd-rtnl/rtnl-internal.h
index 05b88b1ad..05b88b1ad 100644
--- a/src/libsystemd/sd-rtnl/rtnl-internal.h
+++ b/src/libelogind/sd-rtnl/rtnl-internal.h
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libelogind/sd-rtnl/rtnl-message.c
index c938471fe..c938471fe 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libelogind/sd-rtnl/rtnl-message.c
diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libelogind/sd-rtnl/rtnl-types.c
index 455ae28d1..455ae28d1 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/src/libelogind/sd-rtnl/rtnl-types.c
diff --git a/src/libsystemd/sd-rtnl/rtnl-types.h b/src/libelogind/sd-rtnl/rtnl-types.h
index 1ab944498..1ab944498 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.h
+++ b/src/libelogind/sd-rtnl/rtnl-types.h
diff --git a/src/libsystemd/sd-rtnl/rtnl-util.c b/src/libelogind/sd-rtnl/rtnl-util.c
index 9ddf074c2..9ddf074c2 100644
--- a/src/libsystemd/sd-rtnl/rtnl-util.c
+++ b/src/libelogind/sd-rtnl/rtnl-util.c
diff --git a/src/libsystemd/sd-rtnl/rtnl-util.h b/src/libelogind/sd-rtnl/rtnl-util.h
index 9e4bdb867..9e4bdb867 100644
--- a/src/libsystemd/sd-rtnl/rtnl-util.h
+++ b/src/libelogind/sd-rtnl/rtnl-util.h
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libelogind/sd-rtnl/sd-rtnl.c
index 40dea1252..40dea1252 100644
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
+++ b/src/libelogind/sd-rtnl/sd-rtnl.c
diff --git a/src/libsystemd/sd-rtnl/test-local-addresses.c b/src/libelogind/sd-rtnl/test-local-addresses.c
index 38cbcfbcc..38cbcfbcc 100644
--- a/src/libsystemd/sd-rtnl/test-local-addresses.c
+++ b/src/libelogind/sd-rtnl/test-local-addresses.c
diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libelogind/sd-rtnl/test-rtnl.c
index 47cce6481..47cce6481 100644
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libelogind/sd-rtnl/test-rtnl.c
diff --git a/src/libsystemd/sd-utf8/Makefile b/src/libelogind/sd-utf8/Makefile
index 94aaae2c4..94aaae2c4 120000
--- a/src/libsystemd/sd-utf8/Makefile
+++ b/src/libelogind/sd-utf8/Makefile
diff --git a/src/libsystemd/sd-utf8/sd-utf8.c b/src/libelogind/sd-utf8/sd-utf8.c
index 6f2aa6064..6f2aa6064 100644
--- a/src/libsystemd/sd-utf8/sd-utf8.c
+++ b/src/libelogind/sd-utf8/sd-utf8.c