systemd: merge branch 'systemd-integration' into master

System Internals / NetworkManager - Thomas Haller [redhat.com] - 16 September 2015 09:54 UTC

c055579 systemd: merge branch 'systemd-integration' into master

src/Makefile.am | 99 +--
src/dhcp-manager/nm-dhcp-systemd.c | 4 +-
src/systemd/src/basic/hostname-util.c | 30 +-
src/systemd/src/basic/hostname-util.h | 5 +-
src/systemd/src/basic/macro.h | 3 +
src/systemd/src/basic/refcnt.h | 4 +-
src/systemd/src/basic/strv.c | 30 +-
src/systemd/src/basic/strv.h | 3 +-
src/systemd/src/basic/time-util.c | 85 ++-
src/systemd/src/basic/time-util.h | 6 +
src/systemd/src/basic/util.c | 364 +++++----
src/systemd/src/basic/util.h | 55 +-
.../src/libsystemd-network/dhcp-identifier.c | 2 +-
src/systemd/src/libsystemd-network/dhcp-internal.h | 4 +-
.../src/libsystemd-network/dhcp-lease-internal.h | 50 +-
src/systemd/src/libsystemd-network/dhcp-option.c | 12 +-
src/systemd/src/libsystemd-network/dhcp-protocol.h | 2 +
.../src/libsystemd-network/dhcp6-internal.h | 7 +-
.../src/libsystemd-network/dhcp6-lease-internal.h | 24 +-
src/systemd/src/libsystemd-network/dhcp6-network.c | 6 +-
src/systemd/src/libsystemd-network/dhcp6-option.c | 99 ++-
.../src/libsystemd-network/dhcp6-protocol.h | 8 +-
.../src/libsystemd-network/network-internal.c | 19 +-
.../src/libsystemd-network/network-internal.h | 6 +-
.../src/libsystemd-network/sd-dhcp-client.c | 78 +-
src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 787 +++++++++++---------
.../src/libsystemd-network/sd-dhcp6-client.c | 141 ++--
.../src/libsystemd-network/sd-dhcp6-lease.c | 223 +++++-
src/systemd/src/libsystemd-network/sd-ipv4ll.c | 45 +-
src/systemd/src/shared/dns-domain.c | 40 +-
src/systemd/src/shared/dns-domain.h | 10 +-
src/systemd/src/systemd/sd-dhcp-lease.h | 12 +-
src/systemd/src/systemd/sd-dhcp6-lease.h | 8 +-
src/systemd/src/systemd/sd-icmp6-nd.h | 81 ++
34 files changed, 1604 insertions(+), 748 deletions(-)

Upstream: cgit.freedesktop.org

  • Share