systemd: merge branch systemd into master

System Internals / NetworkManager - Thomas Haller [redhat.com] - 15 February 2018 09:26 EST

23e4ef509 systemd: merge branch systemd into master

Makefile.am | 2 +
config.h.meson | 3 +
configure.ac | 1 +
meson.build | 1 +
shared/nm-utils/unaligned.h | 60 ++--
src/systemd/sd-adapt/locale-util.h | 3 +
src/systemd/sd-adapt/nm-sd-adapt.h | 11 +-
src/systemd/sd-adapt/procfs-util.h | 3 +
src/systemd/src/basic/ether-addr-util.c | 1 +
src/systemd/src/basic/fd-util.c | 37 +++
src/systemd/src/basic/fd-util.h | 2 +
src/systemd/src/basic/fileio.c | 29 +-
src/systemd/src/basic/fs-util.c | 248 +++++++++++-----
src/systemd/src/basic/fs-util.h | 16 +-
src/systemd/src/basic/hash-funcs.c | 56 ++++
src/systemd/src/basic/hash-funcs.h | 23 +-
src/systemd/src/basic/hashmap.c | 138 +++++++++
src/systemd/src/basic/hashmap.h | 17 ++
src/systemd/src/basic/hostname-util.h | 1 +
src/systemd/src/basic/in-addr-util.c | 2 +
src/systemd/src/basic/io-util.c | 9 +-
src/systemd/src/basic/log.h | 59 ++--
src/systemd/src/basic/macro.h | 10 +-
src/systemd/src/basic/parse-util.c | 46 ++-
src/systemd/src/basic/path-util.c | 37 ++-
src/systemd/src/basic/path-util.h | 1 +
src/systemd/src/basic/process-util.c | 132 ++++++---
src/systemd/src/basic/process-util.h | 52 +++-
src/systemd/src/basic/random-util.c | 5 +-
src/systemd/src/basic/signal-util.h | 7 +
src/systemd/src/basic/socket-util.c | 139 +++++----
src/systemd/src/basic/socket-util.h | 15 +-
src/systemd/src/basic/string-util.c | 29 +-
src/systemd/src/basic/string-util.h | 8 +-
src/systemd/src/basic/strv.c | 45 +--
src/systemd/src/basic/strv.h | 8 +-
src/systemd/src/basic/time-util.c | 10 +-
src/systemd/src/basic/time-util.h | 4 +-
src/systemd/src/basic/util.c | 33 ++-
src/systemd/src/basic/util.h | 2 +
src/systemd/src/libsystemd-network/arp-util.c | 5 +-
.../src/libsystemd-network/dhcp-lease-internal.h | 2 +
src/systemd/src/libsystemd-network/dhcp-network.c | 5 +-
.../src/libsystemd-network/dhcp6-internal.h | 65 ++++-
.../src/libsystemd-network/dhcp6-lease-internal.h | 2 +
src/systemd/src/libsystemd-network/dhcp6-option.c | 316 ++++++++++++++++-----
.../src/libsystemd-network/dhcp6-protocol.h | 1 +
.../src/libsystemd-network/network-internal.c | 1 +
.../src/libsystemd-network/sd-dhcp-client.c | 12 +-
src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 2 +
.../src/libsystemd-network/sd-dhcp6-client.c | 241 +++++++++++-----
.../src/libsystemd-network/sd-dhcp6-lease.c | 36 ++-
src/systemd/src/libsystemd-network/sd-ipv4ll.c | 1 +
src/systemd/src/libsystemd/sd-event/sd-event.c | 55 +++-
src/systemd/src/libsystemd/sd-id128/id128-util.c | 1 +
src/systemd/src/systemd/sd-dhcp6-client.h | 5 +
src/systemd/src/systemd/sd-dhcp6-lease.h | 5 +
src/systemd/src/systemd/sd-event.h | 5 +
58 files changed, 1538 insertions(+), 527 deletions(-)

Upstream: cgit.freedesktop.org


  • Share