From a40feeeb29ed6122f53ba9542d803b7bfc9d7931 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 28 Jul 2016 10:26:19 -0400 Subject: fix --- src/grp-network/libnetworkd-core/networkd-conf.c | 2 +- src/grp-network/libnetworkd-core/networkd-dhcp4.c | 4 ++-- src/grp-network/libnetworkd-core/networkd-dhcp6.c | 2 +- src/grp-network/libnetworkd-core/networkd-ipv4ll.c | 2 +- src/grp-network/libnetworkd-core/networkd-link.c | 4 ++-- src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf | 2 +- src/grp-network/libnetworkd-core/networkd-netdev.c | 2 +- src/grp-network/libnetworkd-core/networkd-network-gperf.gperf | 2 +- src/grp-network/libnetworkd-core/networkd-network.c | 2 +- src/grp-network/libnetworkd-core/networkd-network.h | 2 +- src/grp-network/libnetworkd-core/networkd.h | 2 +- .../systemd-networkd-wait-online/networkd-wait-online-manager.c | 2 +- src/grp-network/test-network-tables.c | 4 ++-- src/grp-network/test-network.c | 4 ++-- src/grp-network/test-networkd-conf.c | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/grp-network') diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c index 384dae624f..e022e313e1 100644 --- a/src/grp-network/libnetworkd-core/networkd-conf.c +++ b/src/grp-network/libnetworkd-core/networkd-conf.c @@ -21,7 +21,7 @@ #include "shared/conf-parser.h" #include "basic/def.h" -#include "dhcp-identifier.h" +#include "systemd-network/dhcp-identifier.h" #include "basic/hexdecoct.h" #include "networkd-conf.h" #include "basic/string-table.h" diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c index 438ffd0842..4fbd9644cd 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c @@ -21,9 +21,9 @@ #include #include "basic/alloc-util.h" -#include "dhcp-lease-internal.h" +#include "systemd-network/dhcp-lease-internal.h" #include "basic/hostname-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m, diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c index c5a3c52e94..4b0f93a222 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c @@ -22,7 +22,7 @@ #include -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link); diff --git a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c index ae323d595b..c82525788d 100644 --- a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c +++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c @@ -20,7 +20,7 @@ #include #include -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static int ipv4ll_address_lost(Link *link) { diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index cb59a8e07c..45ff76c5ec 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -23,11 +23,11 @@ #include "basic/alloc-util.h" #include "shared/bus-util.h" -#include "dhcp-lease-internal.h" +#include "systemd-network/dhcp-lease-internal.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" #include "networkd-lldp-tx.h" #include "basic/set.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf index 37f6884656..cfbff05578 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf @@ -1,7 +1,7 @@ %{ #include #include "shared/conf-parser.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-netdev-bond.h" #include "networkd-netdev-ipvlan.h" #include "networkd-netdev-macvlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c index 33204753c8..dc4cad9c33 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev.c @@ -25,7 +25,7 @@ #include "basic/fd-util.h" #include "basic/list.h" #include "netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-netdev.h" #include "networkd.h" #include "basic/siphash24.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf index 9436e11b66..50e5d1c19e 100644 --- a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf @@ -3,7 +3,7 @@ #include "shared/conf-parser.h" #include "networkd.h" #include "networkd-conf.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" %} struct ConfigPerfItem; %null_strings diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c index e9132d4618..715be97d13 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.c +++ b/src/grp-network/libnetworkd-core/networkd-network.c @@ -26,7 +26,7 @@ #include "shared/dns-domain.h" #include "basic/fd-util.h" #include "basic/hostname-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-network.h" #include "networkd.h" #include "basic/parse-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h index 33c97416f8..3d77524bba 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.h +++ b/src/grp-network/libnetworkd-core/networkd-network.h @@ -23,7 +23,7 @@ #include "udev.h" #include "shared/condition.h" -#include "dhcp-identifier.h" +#include "systemd-network/dhcp-identifier.h" #include "basic/hashmap.h" #include "shared/resolve-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h index cabd43b8e1..a3ae0b988b 100644 --- a/src/grp-network/libnetworkd-core/networkd.h +++ b/src/grp-network/libnetworkd-core/networkd.h @@ -26,7 +26,7 @@ #include #include "udev.h" -#include "dhcp-identifier.h" +#include "systemd-network/dhcp-identifier.h" #include "basic/hashmap.h" #include "basic/list.h" diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c index fbf7a96f45..d905590936 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c @@ -23,7 +23,7 @@ #include "basic/alloc-util.h" #include "netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-wait-online-link.h" #include "networkd-wait-online.h" #include "basic/time-util.h" diff --git a/src/grp-network/test-network-tables.c b/src/grp-network/test-network-tables.c index 1b7eee8a03..2bdc2cee7a 100644 --- a/src/grp-network/test-network-tables.c +++ b/src/grp-network/test-network-tables.c @@ -1,5 +1,5 @@ -#include "dhcp6-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp6-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "ethtool-util.h" #include "netlink-internal.h" #include "networkd-netdev-bond.h" diff --git a/src/grp-network/test-network.c b/src/grp-network/test-network.c index 7e94cff59e..b33965286d 100644 --- a/src/grp-network/test-network.c +++ b/src/grp-network/test-network.c @@ -18,8 +18,8 @@ ***/ #include "basic/alloc-util.h" -#include "dhcp-lease-internal.h" -#include "network-internal.h" +#include "systemd-network/dhcp-lease-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static void test_deserialize_in_addr(void) { diff --git a/src/grp-network/test-networkd-conf.c b/src/grp-network/test-networkd-conf.c index 91863d8a9e..56e9b48f01 100644 --- a/src/grp-network/test-networkd-conf.c +++ b/src/grp-network/test-networkd-conf.c @@ -25,7 +25,7 @@ #include "networkd-conf.h" #include "networkd-network.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" static void test_config_parse_duid_type_one(const char *rvalue, int ret, DUIDType expected) { DUIDType actual = 0; -- cgit v1.2.3-54-g00ecf