diff options
Diffstat (limited to 'src/grp-network')
22 files changed, 28 insertions, 28 deletions
diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c index ed4c887479..03b4a3f1b7 100644 --- a/src/grp-network/libnetworkd-core/networkd-address.c +++ b/src/grp-network/libnetworkd-core/networkd-address.c @@ -20,7 +20,7 @@ #include <net/if.h> #include "basic/alloc-util.h" -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "firewall-util.h" #include "netlink-util.h" #include "networkd-address.h" diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c index 1b3c4fa6e9..384dae624f 100644 --- a/src/grp-network/libnetworkd-core/networkd-conf.c +++ b/src/grp-network/libnetworkd-core/networkd-conf.c @@ -19,7 +19,7 @@ #include <ctype.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/def.h" #include "dhcp-identifier.h" #include "basic/hexdecoct.h" diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c index 74e98b13dc..75fccea6b9 100644 --- a/src/grp-network/libnetworkd-core/networkd-fdb.c +++ b/src/grp-network/libnetworkd-core/networkd-fdb.c @@ -21,7 +21,7 @@ #include <net/if.h> #include "basic/alloc-util.h" -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "netlink-util.h" #include "networkd-fdb.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-gperf.gperf index 3fdfe74955..e1e2a687e6 100644 --- a/src/grp-network/libnetworkd-core/networkd-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-gperf.gperf @@ -1,6 +1,6 @@ %{ #include <stddef.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "networkd-conf.h" %} struct ConfigPerfItem; diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c index e6e36d144b..86fff49be0 100644 --- a/src/grp-network/libnetworkd-core/networkd-link-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c @@ -18,7 +18,7 @@ ***/ #include "basic/alloc-util.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "networkd-link.h" #include "networkd.h" #include "basic/parse-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index d17f6b12a2..cb59a8e07c 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -22,7 +22,7 @@ #include <unistd.h> #include "basic/alloc-util.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "dhcp-lease-internal.h" #include "basic/fd-util.h" #include "basic/fileio.h" @@ -34,7 +34,7 @@ #include "basic/socket-util.h" #include "basic/stdio-util.h" #include "basic/string-table.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/util.h" #include "basic/virt.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c index 42ca07627d..b6cbba5a85 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c @@ -18,7 +18,7 @@ ***/ #include "basic/alloc-util.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "networkd.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState); diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index a9493c38e2..6226c24b01 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/networkd-manager.c @@ -24,10 +24,10 @@ #include <systemd/sd-netlink.h> #include "basic/alloc-util.h" -#include "bus-util.h" -#include "conf-parser.h" +#include "shared/bus-util.h" +#include "shared/conf-parser.h" #include "basic/def.h" -#include "dns-domain.h" +#include "shared/dns-domain.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "libudev-private.h" @@ -37,7 +37,7 @@ #include "basic/ordered-set.h" #include "basic/path-util.h" #include "basic/set.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/virt.h" /* use 8 MB for receive socket kernel queue. */ diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c index f2668f5382..fc1d4eb12f 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c @@ -24,7 +24,7 @@ #include <systemd/sd-netlink.h> #include "basic/alloc-util.h" -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/extract-word.h" #include "basic/missing.h" #include "networkd-netdev-bond.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf index ba04bb0165..37f6884656 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf @@ -1,6 +1,6 @@ %{ #include <stddef.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "network-internal.h" #include "networkd-netdev-bond.h" #include "networkd-netdev-ipvlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c index 96a0bd600f..e388fa6567 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c @@ -19,7 +19,7 @@ #include <net/if.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "networkd-netdev-ipvlan.h" #include "basic/string-table.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c index a651b9a8ab..030ec51b15 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c @@ -19,7 +19,7 @@ #include <net/if.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "networkd-netdev-macvlan.h" #include "basic/string-table.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c index 9d07072ce4..16bb8a56e8 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c @@ -25,7 +25,7 @@ #include <systemd/sd-netlink.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/missing.h" #include "networkd-link.h" #include "networkd-netdev-tunnel.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c index e3d75ac034..1a36e8609f 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c @@ -21,7 +21,7 @@ #include <systemd/sd-netlink.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/alloc-util.h" #include "basic/extract-word.h" #include "basic/parse-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c index 7409542be0..33204753c8 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev.c @@ -21,7 +21,7 @@ #include "basic/alloc-util.h" #include "basic/conf-files.h" -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/fd-util.h" #include "basic/list.h" #include "netlink-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf index 03e4e3b39f..9436e11b66 100644 --- a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf @@ -1,6 +1,6 @@ %{ #include <stddef.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "networkd.h" #include "networkd-conf.h" #include "network-internal.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c index 99a6859e40..e9132d4618 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.c +++ b/src/grp-network/libnetworkd-core/networkd-network.c @@ -22,8 +22,8 @@ #include "basic/alloc-util.h" #include "basic/conf-files.h" -#include "conf-parser.h" -#include "dns-domain.h" +#include "shared/conf-parser.h" +#include "shared/dns-domain.h" #include "basic/fd-util.h" #include "basic/hostname-util.h" #include "network-internal.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h index e5352e497a..33c97416f8 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.h +++ b/src/grp-network/libnetworkd-core/networkd-network.h @@ -22,10 +22,10 @@ #include <systemd/sd-bus.h> #include "udev.h" -#include "condition.h" +#include "shared/condition.h" #include "dhcp-identifier.h" #include "basic/hashmap.h" -#include "resolve-util.h" +#include "shared/resolve-util.h" #include "networkd-address.h" #include "networkd-fdb.h" diff --git a/src/grp-network/libnetworkd-core/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c index bf34f445fe..ee34a7df01 100644 --- a/src/grp-network/libnetworkd-core/networkd-route.c +++ b/src/grp-network/libnetworkd-core/networkd-route.c @@ -18,7 +18,7 @@ ***/ #include "basic/alloc-util.h" -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/in-addr-util.h" #include "netlink-util.h" #include "networkd-route.h" diff --git a/src/grp-network/libnetworkd-core/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c index f33cd3e916..7fb2fb26d2 100644 --- a/src/grp-network/libnetworkd-core/networkd-util.c +++ b/src/grp-network/libnetworkd-core/networkd-util.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "networkd-util.h" #include "basic/parse-util.h" #include "basic/string-table.h" diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c index a2c51e4b9e..efbef4afed 100644 --- a/src/grp-network/networkctl/networkctl.c +++ b/src/grp-network/networkctl/networkctl.c @@ -36,7 +36,7 @@ #include "local-addresses.h" #include "basic/locale-util.h" #include "netlink-util.h" -#include "pager.h" +#include "shared/pager.h" #include "basic/parse-util.h" #include "basic/socket-util.h" #include "basic/sparse-endian.h" diff --git a/src/grp-network/test-network-tables.c b/src/grp-network/test-network-tables.c index adbe09a5e1..1b7eee8a03 100644 --- a/src/grp-network/test-network-tables.c +++ b/src/grp-network/test-network-tables.c @@ -5,7 +5,7 @@ #include "networkd-netdev-bond.h" #include "networkd-netdev-macvlan.h" #include "networkd.h" -#include "test-tables.h" +#include "shared/test-tables.h" int main(int argc, char **argv) { test_table(bond_mode, NETDEV_BOND_MODE); |