diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 17:36:31 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 17:36:31 -0400 |
commit | ea373df773e0e8184a4b3f8ffff3bb43f307cde9 (patch) | |
tree | 7dcee1eb1024ddbd8c8454856a260d4a11096cb1 /src/libsystemd | |
parent | 66318acf57eb377ea9a34cf7cef9be64b236dd8e (diff) | |
parent | 308f7aaa3910b27e3443e0391fd6895535894bb8 (diff) |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libsystemd/src/Makefile
Diffstat (limited to 'src/libsystemd')
-rw-r--r-- | src/libsystemd/src/Makefile | 8 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/DIFFERENCES (renamed from src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION (renamed from src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/PORTING-DBUS1 (renamed from src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-bloom.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-bloom.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-common-errors.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-common-errors.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-container.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-container.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-container.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-container.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-control.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-control.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-control.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-control.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-convenience.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-creds.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-creds.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-dump.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-dump.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-error.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-error.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-error.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-error.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-gvariant.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-gvariant.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-internal.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-internal.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-introspect.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-introspect.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-kernel.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-kernel.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-match.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-match.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-match.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-message.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-message.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-message.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-message.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-objects.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-objects.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-protocol.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-signature.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-signature.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-slot.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-slot.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-socket.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-socket.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-track.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-track.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-track.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-track.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-type.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-type.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/bus-type.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/kdbus.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/kdbus.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/sd-bus.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-benchmark.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-chat.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-cleanup.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-creds.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-error.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-gvariant.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-introspect.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-kernel.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-marshal.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-match.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-objects.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-server.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-signature.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-zero-copy.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-daemon/sd-daemon.c (renamed from src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-enumerator-private.h (renamed from src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-enumerator.c (renamed from src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-internal.h (renamed from src/libsystemd/libsystemd-internal/sd-device/device-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-private.c (renamed from src/libsystemd/libsystemd-internal/sd-device/device-private.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-private.h (renamed from src/libsystemd/libsystemd-internal/sd-device/device-private.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-util.h (renamed from src/libsystemd/libsystemd-internal/sd-device/device-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/sd-device.c (renamed from src/libsystemd/libsystemd-internal/sd-device/sd-device.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-event/sd-event.c (renamed from src/libsystemd/libsystemd-internal/sd-event/sd-event.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-event/test-event.c (renamed from src/libsystemd/libsystemd-internal/sd-event/test-event.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-hwdb/hwdb-internal.h (renamed from src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-hwdb/hwdb-util.h (renamed from src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-hwdb/sd-hwdb.c (renamed from src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-id128/sd-id128.c (renamed from src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/audit-type.c (renamed from src/libsystemd/libsystemd-journal-internal/audit-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/audit-type.h (renamed from src/libsystemd/libsystemd-journal-internal/audit-type.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/catalog.c (renamed from src/libsystemd/libsystemd-journal-internal/catalog.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/catalog.h (renamed from src/libsystemd/libsystemd-journal-internal/catalog.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/compress.c (renamed from src/libsystemd/libsystemd-journal-internal/compress.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/compress.h (renamed from src/libsystemd/libsystemd-journal-internal/compress.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/fsprg.c (renamed from src/libsystemd/libsystemd-journal-internal/fsprg.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/fsprg.h (renamed from src/libsystemd/libsystemd-journal-internal/fsprg.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-authenticate.c (renamed from src/libsystemd/libsystemd-journal-internal/journal-authenticate.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-authenticate.h (renamed from src/libsystemd/libsystemd-journal-internal/journal-authenticate.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-def.h (renamed from src/libsystemd/libsystemd-journal-internal/journal-def.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-file.c (renamed from src/libsystemd/libsystemd-journal-internal/journal-file.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-file.h (renamed from src/libsystemd/libsystemd-journal-internal/journal-file.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-internal.h (renamed from src/libsystemd/libsystemd-journal-internal/journal-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-send.c (renamed from src/libsystemd/libsystemd-journal-internal/journal-send.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-vacuum.c (renamed from src/libsystemd/libsystemd-journal-internal/journal-vacuum.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-vacuum.h (renamed from src/libsystemd/libsystemd-journal-internal/journal-vacuum.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-verify.c (renamed from src/libsystemd/libsystemd-journal-internal/journal-verify.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-verify.h (renamed from src/libsystemd/libsystemd-journal-internal/journal-verify.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/lookup3.c (renamed from src/libsystemd/libsystemd-journal-internal/lookup3.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/lookup3.h (renamed from src/libsystemd/libsystemd-journal-internal/lookup3.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/mmap-cache.c (renamed from src/libsystemd/libsystemd-journal-internal/mmap-cache.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/mmap-cache.h (renamed from src/libsystemd/libsystemd-journal-internal/mmap-cache.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/sd-journal.c (renamed from src/libsystemd/libsystemd-journal-internal/sd-journal.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-login/sd-login.c (renamed from src/libsystemd/libsystemd-internal/sd-login/sd-login.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-login/test-login.c (renamed from src/libsystemd/libsystemd-internal/sd-login/test-login.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/local-addresses.c | 274 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/local-addresses.h | 36 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-internal.h (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-message.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-socket.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-types.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-types.h (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-util.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-util.h (renamed from src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/rtnl-message.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/sd-netlink.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/test-local-addresses.c | 56 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/test-netlink.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-network/network-util.c (renamed from src/libsystemd/libsystemd-internal/sd-network/network-util.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-network/network-util.h (renamed from src/libsystemd/libsystemd-internal/sd-network/network-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-network/sd-network.c (renamed from src/libsystemd/libsystemd-internal/sd-network/sd-network.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-path/sd-path.c (renamed from src/libsystemd/libsystemd-internal/sd-path/sd-path.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-resolve/sd-resolve.c (renamed from src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-resolve/test-resolve.c (renamed from src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-utf8/sd-utf8.c (renamed from src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/subdir.mk (renamed from src/libsystemd/libsystemd-internal/subdir.mk) | 0 |
122 files changed, 371 insertions, 3 deletions
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index c90c930c94..38c7d3a64f 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -258,7 +258,7 @@ pkginclude_HEADERS += \ src/systemd/sd-messages.h \ src/systemd/_sd-common.h -libsystemd_journal_internal_la_SOURCES = \ +_libsystemd_journal_internal_la_SOURCES = \ src/journal/sd-journal.c \ src/systemd/sd-journal.h \ src/systemd/_sd-common.h \ @@ -312,7 +312,7 @@ libsystemd_journal_internal_la_LIBADD += \ endif # HAVE_LZ4 ifneq ($(HAVE_GCRYPT),) -libsystemd_journal_internal_la_SOURCES += \ +_libsystemd_journal_internal_la_SOURCES += \ src/journal/journal-authenticate.c \ src/journal/journal-authenticate.h \ src/journal/fsprg.c \ @@ -334,7 +334,9 @@ systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" $(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h -libsystemd-internal.la.SOURCES = $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) +libsystemd-internal.la.SOURCES = +libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,src/%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) +libsystemd-internal.la.SOURCES += $(addprefix src/sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES)))) libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo)) at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES))) diff --git a/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES b/src/libsystemd/src/sd-bus/DIFFERENCES index db269675a7..db269675a7 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES +++ b/src/libsystemd/src/sd-bus/DIFFERENCES diff --git a/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION b/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION index 6aeb11364a..6aeb11364a 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION +++ b/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION diff --git a/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 b/src/libsystemd/src/sd-bus/PORTING-DBUS1 index 2dedb28bcf..2dedb28bcf 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 +++ b/src/libsystemd/src/sd-bus/PORTING-DBUS1 diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c b/src/libsystemd/src/sd-bus/bus-bloom.c index 112769fcb6..112769fcb6 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c +++ b/src/libsystemd/src/sd-bus/bus-bloom.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h b/src/libsystemd/src/sd-bus/bus-bloom.h index c824622b95..c824622b95 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h +++ b/src/libsystemd/src/sd-bus/bus-bloom.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c b/src/libsystemd/src/sd-bus/bus-common-errors.c index a19e98e94b..a19e98e94b 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c +++ b/src/libsystemd/src/sd-bus/bus-common-errors.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h b/src/libsystemd/src/sd-bus/bus-common-errors.h index c8f369cb78..c8f369cb78 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h +++ b/src/libsystemd/src/sd-bus/bus-common-errors.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c b/src/libsystemd/src/sd-bus/bus-container.c index 3191d27ded..3191d27ded 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c +++ b/src/libsystemd/src/sd-bus/bus-container.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h b/src/libsystemd/src/sd-bus/bus-container.h index 5cd6d15ede..5cd6d15ede 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h +++ b/src/libsystemd/src/sd-bus/bus-container.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c index 00de530d58..00de530d58 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c +++ b/src/libsystemd/src/sd-bus/bus-control.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h b/src/libsystemd/src/sd-bus/bus-control.h index 229c95efb0..229c95efb0 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h +++ b/src/libsystemd/src/sd-bus/bus-control.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c b/src/libsystemd/src/sd-bus/bus-convenience.c index 2d06bf541f..2d06bf541f 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c +++ b/src/libsystemd/src/sd-bus/bus-convenience.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c b/src/libsystemd/src/sd-bus/bus-creds.c index c4f693dee9..c4f693dee9 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c +++ b/src/libsystemd/src/sd-bus/bus-creds.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h b/src/libsystemd/src/sd-bus/bus-creds.h index 3e2311f91d..3e2311f91d 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h +++ b/src/libsystemd/src/sd-bus/bus-creds.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c b/src/libsystemd/src/sd-bus/bus-dump.c index 21a6b20a11..21a6b20a11 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c +++ b/src/libsystemd/src/sd-bus/bus-dump.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h b/src/libsystemd/src/sd-bus/bus-dump.h index 68fa043786..68fa043786 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h +++ b/src/libsystemd/src/sd-bus/bus-dump.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c b/src/libsystemd/src/sd-bus/bus-error.c index b6bb0c4a83..b6bb0c4a83 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c +++ b/src/libsystemd/src/sd-bus/bus-error.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h b/src/libsystemd/src/sd-bus/bus-error.h index b7aedf406d..b7aedf406d 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h +++ b/src/libsystemd/src/sd-bus/bus-error.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c b/src/libsystemd/src/sd-bus/bus-gvariant.c index 58782767fa..58782767fa 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c +++ b/src/libsystemd/src/sd-bus/bus-gvariant.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h b/src/libsystemd/src/sd-bus/bus-gvariant.h index 6da637fb05..6da637fb05 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h +++ b/src/libsystemd/src/sd-bus/bus-gvariant.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c b/src/libsystemd/src/sd-bus/bus-internal.c index caca679086..caca679086 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c +++ b/src/libsystemd/src/sd-bus/bus-internal.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h b/src/libsystemd/src/sd-bus/bus-internal.h index 8c4c6fa772..8c4c6fa772 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h +++ b/src/libsystemd/src/sd-bus/bus-internal.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c b/src/libsystemd/src/sd-bus/bus-introspect.c index 8f93edb8da..8f93edb8da 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c +++ b/src/libsystemd/src/sd-bus/bus-introspect.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h b/src/libsystemd/src/sd-bus/bus-introspect.h index 87ac03b26a..87ac03b26a 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h +++ b/src/libsystemd/src/sd-bus/bus-introspect.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c b/src/libsystemd/src/sd-bus/bus-kernel.c index 59398b841d..59398b841d 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c +++ b/src/libsystemd/src/sd-bus/bus-kernel.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h b/src/libsystemd/src/sd-bus/bus-kernel.h index 2927ba26a5..2927ba26a5 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h +++ b/src/libsystemd/src/sd-bus/bus-kernel.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c b/src/libsystemd/src/sd-bus/bus-match.c index 397baf6f33..397baf6f33 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c +++ b/src/libsystemd/src/sd-bus/bus-match.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h b/src/libsystemd/src/sd-bus/bus-match.h index 3f71720185..3f71720185 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h +++ b/src/libsystemd/src/sd-bus/bus-match.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c b/src/libsystemd/src/sd-bus/bus-message.c index a9359c1528..a9359c1528 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c +++ b/src/libsystemd/src/sd-bus/bus-message.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h b/src/libsystemd/src/sd-bus/bus-message.h index 6a2c2d533c..6a2c2d533c 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h +++ b/src/libsystemd/src/sd-bus/bus-message.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c b/src/libsystemd/src/sd-bus/bus-objects.c index 9bd07ffcab..9bd07ffcab 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c +++ b/src/libsystemd/src/sd-bus/bus-objects.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h b/src/libsystemd/src/sd-bus/bus-objects.h index e0b8c534ed..e0b8c534ed 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h +++ b/src/libsystemd/src/sd-bus/bus-objects.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h b/src/libsystemd/src/sd-bus/bus-protocol.h index 9d180cb284..9d180cb284 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h +++ b/src/libsystemd/src/sd-bus/bus-protocol.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c b/src/libsystemd/src/sd-bus/bus-signature.c index 7bc243494a..7bc243494a 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c +++ b/src/libsystemd/src/sd-bus/bus-signature.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h b/src/libsystemd/src/sd-bus/bus-signature.h index 1e0cd7f587..1e0cd7f587 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h +++ b/src/libsystemd/src/sd-bus/bus-signature.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c b/src/libsystemd/src/sd-bus/bus-slot.c index 75c1692bf5..75c1692bf5 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c +++ b/src/libsystemd/src/sd-bus/bus-slot.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h b/src/libsystemd/src/sd-bus/bus-slot.h index b862799d1c..b862799d1c 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h +++ b/src/libsystemd/src/sd-bus/bus-slot.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c b/src/libsystemd/src/sd-bus/bus-socket.c index 1486d7cd55..1486d7cd55 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c +++ b/src/libsystemd/src/sd-bus/bus-socket.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h b/src/libsystemd/src/sd-bus/bus-socket.h index 6e1d32e6a7..6e1d32e6a7 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h +++ b/src/libsystemd/src/sd-bus/bus-socket.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c b/src/libsystemd/src/sd-bus/bus-track.c index 81e6d22816..81e6d22816 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c +++ b/src/libsystemd/src/sd-bus/bus-track.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h b/src/libsystemd/src/sd-bus/bus-track.h index 7d93a727d6..7d93a727d6 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h +++ b/src/libsystemd/src/sd-bus/bus-track.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c b/src/libsystemd/src/sd-bus/bus-type.c index c692afc580..c692afc580 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c +++ b/src/libsystemd/src/sd-bus/bus-type.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h b/src/libsystemd/src/sd-bus/bus-type.h index 7169b0f765..7169b0f765 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h +++ b/src/libsystemd/src/sd-bus/bus-type.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h b/src/libsystemd/src/sd-bus/kdbus.h index ecffc6b13c..ecffc6b13c 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h +++ b/src/libsystemd/src/sd-bus/kdbus.h diff --git a/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c index d3c194e135..d3c194e135 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c +++ b/src/libsystemd/src/sd-bus/sd-bus.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c b/src/libsystemd/src/sd-bus/test-bus-benchmark.c index a222d36bb4..a222d36bb4 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/src/sd-bus/test-bus-benchmark.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c b/src/libsystemd/src/sd-bus/test-bus-chat.c index 1f028d2b23..1f028d2b23 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c +++ b/src/libsystemd/src/sd-bus/test-bus-chat.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c b/src/libsystemd/src/sd-bus/test-bus-cleanup.c index bd4a3fbf34..bd4a3fbf34 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/src/sd-bus/test-bus-cleanup.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c b/src/libsystemd/src/sd-bus/test-bus-creds.c index c58b76c258..c58b76c258 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c +++ b/src/libsystemd/src/sd-bus/test-bus-creds.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c b/src/libsystemd/src/sd-bus/test-bus-error.c index bce3cc31c9..bce3cc31c9 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c +++ b/src/libsystemd/src/sd-bus/test-bus-error.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c b/src/libsystemd/src/sd-bus/test-bus-gvariant.c index 3c9ec9fef0..3c9ec9fef0 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c b/src/libsystemd/src/sd-bus/test-bus-introspect.c index 4425cfae26..4425cfae26 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/src/sd-bus/test-bus-introspect.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c index f16e14a310..f16e14a310 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c b/src/libsystemd/src/sd-bus/test-bus-kernel.c index 2a5ba60cc9..2a5ba60cc9 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/src/sd-bus/test-bus-kernel.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c b/src/libsystemd/src/sd-bus/test-bus-marshal.c index 45db4764a0..45db4764a0 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c b/src/libsystemd/src/sd-bus/test-bus-match.c index 29c4529f95..29c4529f95 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c +++ b/src/libsystemd/src/sd-bus/test-bus-match.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c b/src/libsystemd/src/sd-bus/test-bus-objects.c index e9bb655665..e9bb655665 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c +++ b/src/libsystemd/src/sd-bus/test-bus-objects.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c b/src/libsystemd/src/sd-bus/test-bus-server.c index 190410674b..190410674b 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c +++ b/src/libsystemd/src/sd-bus/test-bus-server.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c b/src/libsystemd/src/sd-bus/test-bus-signature.c index 4f4fd093bf..4f4fd093bf 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c +++ b/src/libsystemd/src/sd-bus/test-bus-signature.c diff --git a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c b/src/libsystemd/src/sd-bus/test-bus-zero-copy.c index 9e20d67670..9e20d67670 100644 --- a/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/src/sd-bus/test-bus-zero-copy.c diff --git a/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c b/src/libsystemd/src/sd-daemon/sd-daemon.c index fa92199c43..fa92199c43 100644 --- a/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c +++ b/src/libsystemd/src/sd-daemon/sd-daemon.c diff --git a/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h b/src/libsystemd/src/sd-device/device-enumerator-private.h index d46e26b56e..d46e26b56e 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h +++ b/src/libsystemd/src/sd-device/device-enumerator-private.h diff --git a/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c b/src/libsystemd/src/sd-device/device-enumerator.c index 796728ee0e..796728ee0e 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c +++ b/src/libsystemd/src/sd-device/device-enumerator.c diff --git a/src/libsystemd/libsystemd-internal/sd-device/device-internal.h b/src/libsystemd/src/sd-device/device-internal.h index ab222e27de..ab222e27de 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/device-internal.h +++ b/src/libsystemd/src/sd-device/device-internal.h diff --git a/src/libsystemd/libsystemd-internal/sd-device/device-private.c b/src/libsystemd/src/sd-device/device-private.c index 51cabcb048..51cabcb048 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/device-private.c +++ b/src/libsystemd/src/sd-device/device-private.c diff --git a/src/libsystemd/libsystemd-internal/sd-device/device-private.h b/src/libsystemd/src/sd-device/device-private.h index d6add2f7b2..d6add2f7b2 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/device-private.h +++ b/src/libsystemd/src/sd-device/device-private.h diff --git a/src/libsystemd/libsystemd-internal/sd-device/device-util.h b/src/libsystemd/src/sd-device/device-util.h index 5b42e11de6..5b42e11de6 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/device-util.h +++ b/src/libsystemd/src/sd-device/device-util.h diff --git a/src/libsystemd/libsystemd-internal/sd-device/sd-device.c b/src/libsystemd/src/sd-device/sd-device.c index d21a67cd4c..d21a67cd4c 100644 --- a/src/libsystemd/libsystemd-internal/sd-device/sd-device.c +++ b/src/libsystemd/src/sd-device/sd-device.c diff --git a/src/libsystemd/libsystemd-internal/sd-event/sd-event.c b/src/libsystemd/src/sd-event/sd-event.c index 7f6f485353..7f6f485353 100644 --- a/src/libsystemd/libsystemd-internal/sd-event/sd-event.c +++ b/src/libsystemd/src/sd-event/sd-event.c diff --git a/src/libsystemd/libsystemd-internal/sd-event/test-event.c b/src/libsystemd/src/sd-event/test-event.c index 324ad7ee02..324ad7ee02 100644 --- a/src/libsystemd/libsystemd-internal/sd-event/test-event.c +++ b/src/libsystemd/src/sd-event/test-event.c diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h b/src/libsystemd/src/sd-hwdb/hwdb-internal.h index 8ffb5e5c74..8ffb5e5c74 100644 --- a/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/src/sd-hwdb/hwdb-internal.h diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h b/src/libsystemd/src/sd-hwdb/hwdb-util.h index 05dc47962b..05dc47962b 100644 --- a/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h +++ b/src/libsystemd/src/sd-hwdb/hwdb-util.h diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c b/src/libsystemd/src/sd-hwdb/sd-hwdb.c index 7dcfe95b87..7dcfe95b87 100644 --- a/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.c diff --git a/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c b/src/libsystemd/src/sd-id128/sd-id128.c index cda3e9f0df..cda3e9f0df 100644 --- a/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c +++ b/src/libsystemd/src/sd-id128/sd-id128.c diff --git a/src/libsystemd/libsystemd-journal-internal/audit-type.c b/src/libsystemd/src/sd-journal/audit-type.c index 71e8790ca8..71e8790ca8 100644 --- a/src/libsystemd/libsystemd-journal-internal/audit-type.c +++ b/src/libsystemd/src/sd-journal/audit-type.c diff --git a/src/libsystemd/libsystemd-journal-internal/audit-type.h b/src/libsystemd/src/sd-journal/audit-type.h index 1dd2163707..1dd2163707 100644 --- a/src/libsystemd/libsystemd-journal-internal/audit-type.h +++ b/src/libsystemd/src/sd-journal/audit-type.h diff --git a/src/libsystemd/libsystemd-journal-internal/catalog.c b/src/libsystemd/src/sd-journal/catalog.c index 70838d958c..70838d958c 100644 --- a/src/libsystemd/libsystemd-journal-internal/catalog.c +++ b/src/libsystemd/src/sd-journal/catalog.c diff --git a/src/libsystemd/libsystemd-journal-internal/catalog.h b/src/libsystemd/src/sd-journal/catalog.h index b621de3068..b621de3068 100644 --- a/src/libsystemd/libsystemd-journal-internal/catalog.h +++ b/src/libsystemd/src/sd-journal/catalog.h diff --git a/src/libsystemd/libsystemd-journal-internal/compress.c b/src/libsystemd/src/sd-journal/compress.c index ba734b5561..ba734b5561 100644 --- a/src/libsystemd/libsystemd-journal-internal/compress.c +++ b/src/libsystemd/src/sd-journal/compress.c diff --git a/src/libsystemd/libsystemd-journal-internal/compress.h b/src/libsystemd/src/sd-journal/compress.h index c138099d9a..c138099d9a 100644 --- a/src/libsystemd/libsystemd-journal-internal/compress.h +++ b/src/libsystemd/src/sd-journal/compress.h diff --git a/src/libsystemd/libsystemd-journal-internal/fsprg.c b/src/libsystemd/src/sd-journal/fsprg.c index 612b10f3a9..612b10f3a9 100644 --- a/src/libsystemd/libsystemd-journal-internal/fsprg.c +++ b/src/libsystemd/src/sd-journal/fsprg.c diff --git a/src/libsystemd/libsystemd-journal-internal/fsprg.h b/src/libsystemd/src/sd-journal/fsprg.h index 829b56e240..829b56e240 100644 --- a/src/libsystemd/libsystemd-journal-internal/fsprg.h +++ b/src/libsystemd/src/sd-journal/fsprg.h diff --git a/src/libsystemd/libsystemd-journal-internal/journal-authenticate.c b/src/libsystemd/src/sd-journal/journal-authenticate.c index d8af113d3f..d8af113d3f 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-authenticate.c +++ b/src/libsystemd/src/sd-journal/journal-authenticate.c diff --git a/src/libsystemd/libsystemd-journal-internal/journal-authenticate.h b/src/libsystemd/src/sd-journal/journal-authenticate.h index 6c87319ede..6c87319ede 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-authenticate.h +++ b/src/libsystemd/src/sd-journal/journal-authenticate.h diff --git a/src/libsystemd/libsystemd-journal-internal/journal-def.h b/src/libsystemd/src/sd-journal/journal-def.h index a0a052ce4f..a0a052ce4f 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-def.h +++ b/src/libsystemd/src/sd-journal/journal-def.h diff --git a/src/libsystemd/libsystemd-journal-internal/journal-file.c b/src/libsystemd/src/sd-journal/journal-file.c index 13db5c53de..13db5c53de 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-file.c +++ b/src/libsystemd/src/sd-journal/journal-file.c diff --git a/src/libsystemd/libsystemd-journal-internal/journal-file.h b/src/libsystemd/src/sd-journal/journal-file.h index e48e98f424..e48e98f424 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-file.h +++ b/src/libsystemd/src/sd-journal/journal-file.h diff --git a/src/libsystemd/libsystemd-journal-internal/journal-internal.h b/src/libsystemd/src/sd-journal/journal-internal.h index d8eb11ad06..d8eb11ad06 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-internal.h +++ b/src/libsystemd/src/sd-journal/journal-internal.h diff --git a/src/libsystemd/libsystemd-journal-internal/journal-send.c b/src/libsystemd/src/sd-journal/journal-send.c index 5a49211f85..5a49211f85 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-send.c +++ b/src/libsystemd/src/sd-journal/journal-send.c diff --git a/src/libsystemd/libsystemd-journal-internal/journal-vacuum.c b/src/libsystemd/src/sd-journal/journal-vacuum.c index cd2676ab63..cd2676ab63 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-vacuum.c +++ b/src/libsystemd/src/sd-journal/journal-vacuum.c diff --git a/src/libsystemd/libsystemd-journal-internal/journal-vacuum.h b/src/libsystemd/src/sd-journal/journal-vacuum.h index 1e750a2170..1e750a2170 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-vacuum.h +++ b/src/libsystemd/src/sd-journal/journal-vacuum.h diff --git a/src/libsystemd/libsystemd-journal-internal/journal-verify.c b/src/libsystemd/src/sd-journal/journal-verify.c index 26572ddd76..26572ddd76 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-verify.c +++ b/src/libsystemd/src/sd-journal/journal-verify.c diff --git a/src/libsystemd/libsystemd-journal-internal/journal-verify.h b/src/libsystemd/src/sd-journal/journal-verify.h index 8f0eaf6daa..8f0eaf6daa 100644 --- a/src/libsystemd/libsystemd-journal-internal/journal-verify.h +++ b/src/libsystemd/src/sd-journal/journal-verify.h diff --git a/src/libsystemd/libsystemd-journal-internal/lookup3.c b/src/libsystemd/src/sd-journal/lookup3.c index 3d791234f4..3d791234f4 100644 --- a/src/libsystemd/libsystemd-journal-internal/lookup3.c +++ b/src/libsystemd/src/sd-journal/lookup3.c diff --git a/src/libsystemd/libsystemd-journal-internal/lookup3.h b/src/libsystemd/src/sd-journal/lookup3.h index 787921ffbf..787921ffbf 100644 --- a/src/libsystemd/libsystemd-journal-internal/lookup3.h +++ b/src/libsystemd/src/sd-journal/lookup3.h diff --git a/src/libsystemd/libsystemd-journal-internal/mmap-cache.c b/src/libsystemd/src/sd-journal/mmap-cache.c index 6bcd9b6ac8..6bcd9b6ac8 100644 --- a/src/libsystemd/libsystemd-journal-internal/mmap-cache.c +++ b/src/libsystemd/src/sd-journal/mmap-cache.c diff --git a/src/libsystemd/libsystemd-journal-internal/mmap-cache.h b/src/libsystemd/src/sd-journal/mmap-cache.h index 199d944647..199d944647 100644 --- a/src/libsystemd/libsystemd-journal-internal/mmap-cache.h +++ b/src/libsystemd/src/sd-journal/mmap-cache.h diff --git a/src/libsystemd/libsystemd-journal-internal/sd-journal.c b/src/libsystemd/src/sd-journal/sd-journal.c index 930486d65f..930486d65f 100644 --- a/src/libsystemd/libsystemd-journal-internal/sd-journal.c +++ b/src/libsystemd/src/sd-journal/sd-journal.c diff --git a/src/libsystemd/libsystemd-internal/sd-login/sd-login.c b/src/libsystemd/src/sd-login/sd-login.c index 84831d5e95..84831d5e95 100644 --- a/src/libsystemd/libsystemd-internal/sd-login/sd-login.c +++ b/src/libsystemd/src/sd-login/sd-login.c diff --git a/src/libsystemd/libsystemd-internal/sd-login/test-login.c b/src/libsystemd/src/sd-login/test-login.c index 994c76df4a..994c76df4a 100644 --- a/src/libsystemd/libsystemd-internal/sd-login/test-login.c +++ b/src/libsystemd/src/sd-login/test-login.c diff --git a/src/libsystemd/src/sd-netlink/local-addresses.c b/src/libsystemd/src/sd-netlink/local-addresses.c new file mode 100644 index 0000000000..5cceddd03c --- /dev/null +++ b/src/libsystemd/src/sd-netlink/local-addresses.c @@ -0,0 +1,274 @@ +/*** + This file is part of systemd. + + Copyright 2008-2011 Lennart Poettering + Copyright 2014 Tom Gundersen + + 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. + + systemd 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/>. +***/ + +#include <systemd/sd-netlink.h> + +#include "alloc-util.h" +#include "local-addresses.h" +#include "macro.h" + +static int address_compare(const void *_a, const void *_b) { + const struct local_address *a = _a, *b = _b; + + /* Order lowest scope first, IPv4 before IPv6, lowest interface index first */ + + if (a->family == AF_INET && b->family == AF_INET6) + return -1; + if (a->family == AF_INET6 && b->family == AF_INET) + return 1; + + if (a->scope < b->scope) + return -1; + if (a->scope > b->scope) + return 1; + + if (a->metric < b->metric) + return -1; + if (a->metric > b->metric) + return 1; + + if (a->ifindex < b->ifindex) + return -1; + if (a->ifindex > b->ifindex) + return 1; + + return memcmp(&a->address, &b->address, FAMILY_ADDRESS_SIZE(a->family)); +} + +int local_addresses(sd_netlink *context, int ifindex, int af, struct local_address **ret) { + _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL; + _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; + _cleanup_free_ struct local_address *list = NULL; + size_t n_list = 0, n_allocated = 0; + sd_netlink_message *m; + int r; + + assert(ret); + + if (context) + rtnl = sd_netlink_ref(context); + else { + r = sd_netlink_open(&rtnl); + if (r < 0) + return r; + } + + r = sd_rtnl_message_new_addr(rtnl, &req, RTM_GETADDR, 0, af); + if (r < 0) + return r; + + r = sd_netlink_call(rtnl, req, 0, &reply); + if (r < 0) + return r; + + for (m = reply; m; m = sd_netlink_message_next(m)) { + struct local_address *a; + unsigned char flags; + uint16_t type; + int ifi, family; + + r = sd_netlink_message_get_errno(m); + if (r < 0) + return r; + + r = sd_netlink_message_get_type(m, &type); + if (r < 0) + return r; + if (type != RTM_NEWADDR) + continue; + + r = sd_rtnl_message_addr_get_ifindex(m, &ifi); + if (r < 0) + return r; + if (ifindex > 0 && ifi != ifindex) + continue; + + r = sd_rtnl_message_addr_get_family(m, &family); + if (r < 0) + return r; + if (af != AF_UNSPEC && af != family) + continue; + + r = sd_rtnl_message_addr_get_flags(m, &flags); + if (r < 0) + return r; + if (flags & IFA_F_DEPRECATED) + continue; + + if (!GREEDY_REALLOC0(list, n_allocated, n_list+1)) + return -ENOMEM; + + a = list + n_list; + + r = sd_rtnl_message_addr_get_scope(m, &a->scope); + if (r < 0) + return r; + + if (ifindex == 0 && (a->scope == RT_SCOPE_HOST || a->scope == RT_SCOPE_NOWHERE)) + continue; + + switch (family) { + + case AF_INET: + r = sd_netlink_message_read_in_addr(m, IFA_LOCAL, &a->address.in); + if (r < 0) { + r = sd_netlink_message_read_in_addr(m, IFA_ADDRESS, &a->address.in); + if (r < 0) + continue; + } + break; + + case AF_INET6: + r = sd_netlink_message_read_in6_addr(m, IFA_LOCAL, &a->address.in6); + if (r < 0) { + r = sd_netlink_message_read_in6_addr(m, IFA_ADDRESS, &a->address.in6); + if (r < 0) + continue; + } + break; + + default: + continue; + } + + a->ifindex = ifi; + a->family = family; + + n_list++; + }; + + qsort_safe(list, n_list, sizeof(struct local_address), address_compare); + + *ret = list; + list = NULL; + + return (int) n_list; +} + +int local_gateways(sd_netlink *context, int ifindex, int af, struct local_address **ret) { + _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL; + _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; + _cleanup_free_ struct local_address *list = NULL; + sd_netlink_message *m = NULL; + size_t n_list = 0, n_allocated = 0; + int r; + + assert(ret); + + if (context) + rtnl = sd_netlink_ref(context); + else { + r = sd_netlink_open(&rtnl); + if (r < 0) + return r; + } + + r = sd_rtnl_message_new_route(rtnl, &req, RTM_GETROUTE, af, RTPROT_UNSPEC); + if (r < 0) + return r; + + r = sd_netlink_message_request_dump(req, true); + if (r < 0) + return r; + + r = sd_netlink_call(rtnl, req, 0, &reply); + if (r < 0) + return r; + + for (m = reply; m; m = sd_netlink_message_next(m)) { + struct local_address *a; + uint16_t type; + unsigned char dst_len, src_len; + uint32_t ifi; + int family; + + r = sd_netlink_message_get_errno(m); + if (r < 0) + return r; + + r = sd_netlink_message_get_type(m, &type); + if (r < 0) + return r; + if (type != RTM_NEWROUTE) + continue; + + /* We only care for default routes */ + r = sd_rtnl_message_route_get_dst_prefixlen(m, &dst_len); + if (r < 0) + return r; + if (dst_len != 0) + continue; + + r = sd_rtnl_message_route_get_src_prefixlen(m, &src_len); + if (r < 0) + return r; + if (src_len != 0) + continue; + + r = sd_netlink_message_read_u32(m, RTA_OIF, &ifi); + if (r < 0) + return r; + if (ifindex > 0 && (int) ifi != ifindex) + continue; + + r = sd_rtnl_message_route_get_family(m, &family); + if (r < 0) + return r; + if (af != AF_UNSPEC && af != family) + continue; + + if (!GREEDY_REALLOC0(list, n_allocated, n_list + 1)) + return -ENOMEM; + + a = list + n_list; + + switch (family) { + case AF_INET: + r = sd_netlink_message_read_in_addr(m, RTA_GATEWAY, &a->address.in); + if (r < 0) + continue; + + break; + case AF_INET6: + r = sd_netlink_message_read_in6_addr(m, RTA_GATEWAY, &a->address.in6); + if (r < 0) + continue; + + break; + default: + continue; + } + + sd_netlink_message_read_u32(m, RTA_PRIORITY, &a->metric); + + a->ifindex = ifi; + a->family = family; + + n_list++; + } + + if (n_list > 0) + qsort(list, n_list, sizeof(struct local_address), address_compare); + + *ret = list; + list = NULL; + + return (int) n_list; +} diff --git a/src/libsystemd/src/sd-netlink/local-addresses.h b/src/libsystemd/src/sd-netlink/local-addresses.h new file mode 100644 index 0000000000..1ddc50ace5 --- /dev/null +++ b/src/libsystemd/src/sd-netlink/local-addresses.h @@ -0,0 +1,36 @@ +#pragma once + +/*** + This file is part of systemd. + + Copyright 2008-2011 Lennart Poettering + + 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. + + systemd 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/>. +***/ + + +#include <systemd/sd-netlink.h> + +#include "in-addr-util.h" + +struct local_address { + int family, ifindex; + unsigned char scope; + uint32_t metric; + union in_addr_union address; +}; + +int local_addresses(sd_netlink *rtnl, int ifindex, int af, struct local_address **ret); + +int local_gateways(sd_netlink *rtnl, int ifindex, int af, struct local_address **ret); diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h b/src/libsystemd/src/sd-netlink/netlink-internal.h index 1d29c3a369..1d29c3a369 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h +++ b/src/libsystemd/src/sd-netlink/netlink-internal.h diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c b/src/libsystemd/src/sd-netlink/netlink-message.c index c00785ea41..c00785ea41 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c +++ b/src/libsystemd/src/sd-netlink/netlink-message.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c b/src/libsystemd/src/sd-netlink/netlink-socket.c index d28a413c65..d28a413c65 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c +++ b/src/libsystemd/src/sd-netlink/netlink-socket.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c b/src/libsystemd/src/sd-netlink/netlink-types.c index 3a4bac2ced..3a4bac2ced 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c +++ b/src/libsystemd/src/sd-netlink/netlink-types.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h b/src/libsystemd/src/sd-netlink/netlink-types.h index ecb20bfcdc..ecb20bfcdc 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h +++ b/src/libsystemd/src/sd-netlink/netlink-types.h diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c b/src/libsystemd/src/sd-netlink/netlink-util.c index 828ae7db7f..828ae7db7f 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c +++ b/src/libsystemd/src/sd-netlink/netlink-util.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h b/src/libsystemd/src/sd-netlink/netlink-util.h index e8f932549f..e8f932549f 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h +++ b/src/libsystemd/src/sd-netlink/netlink-util.h diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c b/src/libsystemd/src/sd-netlink/rtnl-message.c index f6482a6157..f6482a6157 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c +++ b/src/libsystemd/src/sd-netlink/rtnl-message.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c b/src/libsystemd/src/sd-netlink/sd-netlink.c index 3c7488463c..3c7488463c 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c +++ b/src/libsystemd/src/sd-netlink/sd-netlink.c diff --git a/src/libsystemd/src/sd-netlink/test-local-addresses.c b/src/libsystemd/src/sd-netlink/test-local-addresses.c new file mode 100644 index 0000000000..e0e28cc0cc --- /dev/null +++ b/src/libsystemd/src/sd-netlink/test-local-addresses.c @@ -0,0 +1,56 @@ +/*** + This file is part of systemd. + + Copyright 2014 Lennart Poettering + + 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. + + systemd 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/>. +***/ + +#include "af-list.h" +#include "alloc-util.h" +#include "in-addr-util.h" +#include "local-addresses.h" + +static void print_local_addresses(struct local_address *a, unsigned n) { + unsigned i; + + for (i = 0; i < n; i++) { + _cleanup_free_ char *b = NULL; + + assert_se(in_addr_to_string(a[i].family, &a[i].address, &b) >= 0); + printf("%s if%i scope=%i metric=%u address=%s\n", af_to_name(a[i].family), a[i].ifindex, a[i].scope, a[i].metric, b); + } +} + +int main(int argc, char *argv[]) { + struct local_address *a; + int n; + + a = NULL; + n = local_addresses(NULL, 0, AF_UNSPEC, &a); + assert_se(n >= 0); + + printf("Local Addresses:\n"); + print_local_addresses(a, (unsigned) n); + a = mfree(a); + + n = local_gateways(NULL, 0, AF_UNSPEC, &a); + assert_se(n >= 0); + + printf("Local Gateways:\n"); + print_local_addresses(a, (unsigned) n); + free(a); + + return 0; +} diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c b/src/libsystemd/src/sd-netlink/test-netlink.c index aadd0f06a8..aadd0f06a8 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c +++ b/src/libsystemd/src/sd-netlink/test-netlink.c diff --git a/src/libsystemd/libsystemd-internal/sd-network/network-util.c b/src/libsystemd/src/sd-network/network-util.c index a0d9b5f1a4..a0d9b5f1a4 100644 --- a/src/libsystemd/libsystemd-internal/sd-network/network-util.c +++ b/src/libsystemd/src/sd-network/network-util.c diff --git a/src/libsystemd/libsystemd-internal/sd-network/network-util.h b/src/libsystemd/src/sd-network/network-util.h index 8c4dbc68b1..8c4dbc68b1 100644 --- a/src/libsystemd/libsystemd-internal/sd-network/network-util.h +++ b/src/libsystemd/src/sd-network/network-util.h diff --git a/src/libsystemd/libsystemd-internal/sd-network/sd-network.c b/src/libsystemd/src/sd-network/sd-network.c index 70083213f9..70083213f9 100644 --- a/src/libsystemd/libsystemd-internal/sd-network/sd-network.c +++ b/src/libsystemd/src/sd-network/sd-network.c diff --git a/src/libsystemd/libsystemd-internal/sd-path/sd-path.c b/src/libsystemd/src/sd-path/sd-path.c index 6d9f3e2a61..6d9f3e2a61 100644 --- a/src/libsystemd/libsystemd-internal/sd-path/sd-path.c +++ b/src/libsystemd/src/sd-path/sd-path.c diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c b/src/libsystemd/src/sd-resolve/sd-resolve.c index 6eacf2b69a..6eacf2b69a 100644 --- a/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c +++ b/src/libsystemd/src/sd-resolve/sd-resolve.c diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c b/src/libsystemd/src/sd-resolve/test-resolve.c index 0209cc77e7..0209cc77e7 100644 --- a/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c +++ b/src/libsystemd/src/sd-resolve/test-resolve.c diff --git a/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c b/src/libsystemd/src/sd-utf8/sd-utf8.c index 77be8e1996..77be8e1996 100644 --- a/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c +++ b/src/libsystemd/src/sd-utf8/sd-utf8.c diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/src/subdir.mk index 752ffa6aed..752ffa6aed 100644 --- a/src/libsystemd/libsystemd-internal/subdir.mk +++ b/src/libsystemd/src/subdir.mk |