all: move "src/" directory to "src/core/"

Like commit ac1a9e03e4d6 ('all: move "src/" directory to "src/core/"')

959 files changed, 0 insertions, 0 deletions

diff --git a/src/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index b9ded4c2f2..b9ded4c2f2 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/core/NetworkManagerUtils.c
diff --git a/src/NetworkManagerUtils.h b/src/core/NetworkManagerUtils.h
index 5373f9cea8..5373f9cea8 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/core/NetworkManagerUtils.h
diff --git a/src/devices/adsl/meson.build b/src/core/devices/adsl/meson.build
index 79834d7faa..79834d7faa 100644
--- a/src/devices/adsl/meson.build
+++ b/src/core/devices/adsl/meson.build
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c
index 07ee6529a6..07ee6529a6 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/core/devices/adsl/nm-atm-manager.c
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/core/devices/adsl/nm-device-adsl.c
index f94ee49af8..f94ee49af8 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/core/devices/adsl/nm-device-adsl.c
diff --git a/src/devices/adsl/nm-device-adsl.h b/src/core/devices/adsl/nm-device-adsl.h
index 9574083084..9574083084 100644
--- a/src/devices/adsl/nm-device-adsl.h
+++ b/src/core/devices/adsl/nm-device-adsl.h
diff --git a/src/devices/bluetooth/meson.build b/src/core/devices/bluetooth/meson.build
index 638a01a2fc..638a01a2fc 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/core/devices/bluetooth/meson.build
diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/core/devices/bluetooth/nm-bluez-common.h
index e70ec3f78b..e70ec3f78b 100644
--- a/src/devices/bluetooth/nm-bluez-common.h
+++ b/src/core/devices/bluetooth/nm-bluez-common.h
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c
index c8c8251691..c8c8251691 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/core/devices/bluetooth/nm-bluez-manager.c
diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/core/devices/bluetooth/nm-bluez-manager.h
index 40a2fcdddd..40a2fcdddd 100644
--- a/src/devices/bluetooth/nm-bluez-manager.h
+++ b/src/core/devices/bluetooth/nm-bluez-manager.h
diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c
index 422c8516f5..422c8516f5 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/core/devices/bluetooth/nm-bluez5-dun.c
diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/core/devices/bluetooth/nm-bluez5-dun.h
index 94fa555068..94fa555068 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.h
+++ b/src/core/devices/bluetooth/nm-bluez5-dun.h
diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/core/devices/bluetooth/nm-bt-error.c
index 8f5265f893..8f5265f893 100644
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/core/devices/bluetooth/nm-bt-error.c
diff --git a/src/devices/bluetooth/nm-bt-error.h b/src/core/devices/bluetooth/nm-bt-error.h
index 766d2d396d..766d2d396d 100644
--- a/src/devices/bluetooth/nm-bt-error.h
+++ b/src/core/devices/bluetooth/nm-bt-error.h
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/core/devices/bluetooth/nm-device-bt.c
index 8523a69c33..8523a69c33 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/core/devices/bluetooth/nm-device-bt.c
diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/core/devices/bluetooth/nm-device-bt.h
index e8a35a2107..e8a35a2107 100644
--- a/src/devices/bluetooth/nm-device-bt.h
+++ b/src/core/devices/bluetooth/nm-device-bt.h
diff --git a/src/devices/bluetooth/tests/nm-bt-test.c b/src/core/devices/bluetooth/tests/nm-bt-test.c
index a57bb0761c..a57bb0761c 100644
--- a/src/devices/bluetooth/tests/nm-bt-test.c
+++ b/src/core/devices/bluetooth/tests/nm-bt-test.c
diff --git a/src/devices/meson.build b/src/core/devices/meson.build
index 40a5c9dcc3..40a5c9dcc3 100644
--- a/src/devices/meson.build
+++ b/src/core/devices/meson.build
diff --git a/src/devices/nm-acd-manager.c b/src/core/devices/nm-acd-manager.c
index e4ac81b2c0..e4ac81b2c0 100644
--- a/src/devices/nm-acd-manager.c
+++ b/src/core/devices/nm-acd-manager.c
diff --git a/src/devices/nm-acd-manager.h b/src/core/devices/nm-acd-manager.h
index 21001c7472..21001c7472 100644
--- a/src/devices/nm-acd-manager.h
+++ b/src/core/devices/nm-acd-manager.h
diff --git a/src/devices/nm-device-6lowpan.c b/src/core/devices/nm-device-6lowpan.c
index cf2be8620c..cf2be8620c 100644
--- a/src/devices/nm-device-6lowpan.c
+++ b/src/core/devices/nm-device-6lowpan.c
diff --git a/src/devices/nm-device-6lowpan.h b/src/core/devices/nm-device-6lowpan.h
index 60207d76fd..60207d76fd 100644
--- a/src/devices/nm-device-6lowpan.h
+++ b/src/core/devices/nm-device-6lowpan.h
diff --git a/src/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c
index 27fa720967..27fa720967 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/core/devices/nm-device-bond.c
diff --git a/src/devices/nm-device-bond.h b/src/core/devices/nm-device-bond.h
index 46be7c23ac..46be7c23ac 100644
--- a/src/devices/nm-device-bond.h
+++ b/src/core/devices/nm-device-bond.h
diff --git a/src/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c
index 2b428beffe..2b428beffe 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/core/devices/nm-device-bridge.c
diff --git a/src/devices/nm-device-bridge.h b/src/core/devices/nm-device-bridge.h
index c942813e80..c942813e80 100644
--- a/src/devices/nm-device-bridge.h
+++ b/src/core/devices/nm-device-bridge.h
diff --git a/src/devices/nm-device-dummy.c b/src/core/devices/nm-device-dummy.c
index 1b34112b32..1b34112b32 100644
--- a/src/devices/nm-device-dummy.c
+++ b/src/core/devices/nm-device-dummy.c
diff --git a/src/devices/nm-device-dummy.h b/src/core/devices/nm-device-dummy.h
index b3670ef927..b3670ef927 100644
--- a/src/devices/nm-device-dummy.h
+++ b/src/core/devices/nm-device-dummy.h
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/core/devices/nm-device-ethernet-utils.c
index 5c35db8327..5c35db8327 100644
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/core/devices/nm-device-ethernet-utils.c
diff --git a/src/devices/nm-device-ethernet-utils.h b/src/core/devices/nm-device-ethernet-utils.h
index d67b9fa146..d67b9fa146 100644
--- a/src/devices/nm-device-ethernet-utils.h
+++ b/src/core/devices/nm-device-ethernet-utils.h
diff --git a/src/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c
index 6d11c59414..6d11c59414 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/core/devices/nm-device-ethernet.c
diff --git a/src/devices/nm-device-ethernet.h b/src/core/devices/nm-device-ethernet.h
index 36b7bc5711..36b7bc5711 100644
--- a/src/devices/nm-device-ethernet.h
+++ b/src/core/devices/nm-device-ethernet.h
diff --git a/src/devices/nm-device-factory.c b/src/core/devices/nm-device-factory.c
index ba33404a2d..ba33404a2d 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/core/devices/nm-device-factory.c
diff --git a/src/devices/nm-device-factory.h b/src/core/devices/nm-device-factory.h
index 5e7a8acd79..5e7a8acd79 100644
--- a/src/devices/nm-device-factory.h
+++ b/src/core/devices/nm-device-factory.h
diff --git a/src/devices/nm-device-generic.c b/src/core/devices/nm-device-generic.c
index 17e34d1254..17e34d1254 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/core/devices/nm-device-generic.c
diff --git a/src/devices/nm-device-generic.h b/src/core/devices/nm-device-generic.h
index 4acc4dc979..4acc4dc979 100644
--- a/src/devices/nm-device-generic.h
+++ b/src/core/devices/nm-device-generic.h
diff --git a/src/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c
index 820b885bf0..820b885bf0 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/core/devices/nm-device-infiniband.c
diff --git a/src/devices/nm-device-infiniband.h b/src/core/devices/nm-device-infiniband.h
index d8be8f2127..d8be8f2127 100644
--- a/src/devices/nm-device-infiniband.h
+++ b/src/core/devices/nm-device-infiniband.h
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/core/devices/nm-device-ip-tunnel.c
index 5ae8d48b77..5ae8d48b77 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/src/core/devices/nm-device-ip-tunnel.c
diff --git a/src/devices/nm-device-ip-tunnel.h b/src/core/devices/nm-device-ip-tunnel.h
index 0d9211ec35..0d9211ec35 100644
--- a/src/devices/nm-device-ip-tunnel.h
+++ b/src/core/devices/nm-device-ip-tunnel.h
diff --git a/src/devices/nm-device-logging.h b/src/core/devices/nm-device-logging.h
index 76d758e0f1..76d758e0f1 100644
--- a/src/devices/nm-device-logging.h
+++ b/src/core/devices/nm-device-logging.h
diff --git a/src/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c
index c27927454d..c27927454d 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/core/devices/nm-device-macsec.c
diff --git a/src/devices/nm-device-macsec.h b/src/core/devices/nm-device-macsec.h
index 9a2f230bcf..9a2f230bcf 100644
--- a/src/devices/nm-device-macsec.h
+++ b/src/core/devices/nm-device-macsec.h
diff --git a/src/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c
index 5017e81ed2..5017e81ed2 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/core/devices/nm-device-macvlan.c
diff --git a/src/devices/nm-device-macvlan.h b/src/core/devices/nm-device-macvlan.h
index f36a7a4a74..f36a7a4a74 100644
--- a/src/devices/nm-device-macvlan.h
+++ b/src/core/devices/nm-device-macvlan.h
diff --git a/src/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c
index 0d1218f77a..0d1218f77a 100644
--- a/src/devices/nm-device-ppp.c
+++ b/src/core/devices/nm-device-ppp.c
diff --git a/src/devices/nm-device-ppp.h b/src/core/devices/nm-device-ppp.h
index 99132a3ebd..99132a3ebd 100644
--- a/src/devices/nm-device-ppp.h
+++ b/src/core/devices/nm-device-ppp.h
diff --git a/src/devices/nm-device-private.h b/src/core/devices/nm-device-private.h
index dbf5105a08..dbf5105a08 100644
--- a/src/devices/nm-device-private.h
+++ b/src/core/devices/nm-device-private.h
diff --git a/src/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c
index 5125a67685..5125a67685 100644
--- a/src/devices/nm-device-tun.c
+++ b/src/core/devices/nm-device-tun.c
diff --git a/src/devices/nm-device-tun.h b/src/core/devices/nm-device-tun.h
index 32d515c10f..32d515c10f 100644
--- a/src/devices/nm-device-tun.h
+++ b/src/core/devices/nm-device-tun.h
diff --git a/src/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c
index 54400c3c49..54400c3c49 100644
--- a/src/devices/nm-device-veth.c
+++ b/src/core/devices/nm-device-veth.c
diff --git a/src/devices/nm-device-veth.h b/src/core/devices/nm-device-veth.h
index e38674468e..e38674468e 100644
--- a/src/devices/nm-device-veth.h
+++ b/src/core/devices/nm-device-veth.h
diff --git a/src/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c
index d3b9d54930..d3b9d54930 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/core/devices/nm-device-vlan.c
diff --git a/src/devices/nm-device-vlan.h b/src/core/devices/nm-device-vlan.h
index 5bf11cd980..5bf11cd980 100644
--- a/src/devices/nm-device-vlan.h
+++ b/src/core/devices/nm-device-vlan.h
diff --git a/src/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c
index 9c3927e146..9c3927e146 100644
--- a/src/devices/nm-device-vrf.c
+++ b/src/core/devices/nm-device-vrf.c
diff --git a/src/devices/nm-device-vrf.h b/src/core/devices/nm-device-vrf.h
index eb09bd9590..eb09bd9590 100644
--- a/src/devices/nm-device-vrf.h
+++ b/src/core/devices/nm-device-vrf.h
diff --git a/src/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c
index cc42ffe4f9..cc42ffe4f9 100644
--- a/src/devices/nm-device-vxlan.c
+++ b/src/core/devices/nm-device-vxlan.c
diff --git a/src/devices/nm-device-vxlan.h b/src/core/devices/nm-device-vxlan.h
index 89683b028d..89683b028d 100644
--- a/src/devices/nm-device-vxlan.h
+++ b/src/core/devices/nm-device-vxlan.h
diff --git a/src/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c
index 8327412eb8..8327412eb8 100644
--- a/src/devices/nm-device-wireguard.c
+++ b/src/core/devices/nm-device-wireguard.c
diff --git a/src/devices/nm-device-wireguard.h b/src/core/devices/nm-device-wireguard.h
index f562f35682..f562f35682 100644
--- a/src/devices/nm-device-wireguard.h
+++ b/src/core/devices/nm-device-wireguard.h
diff --git a/src/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c
index f5c7e79fe9..f5c7e79fe9 100644
--- a/src/devices/nm-device-wpan.c
+++ b/src/core/devices/nm-device-wpan.c
diff --git a/src/devices/nm-device-wpan.h b/src/core/devices/nm-device-wpan.h
index 4bc4f243f1..4bc4f243f1 100644
--- a/src/devices/nm-device-wpan.h
+++ b/src/core/devices/nm-device-wpan.h
diff --git a/src/devices/nm-device.c b/src/core/devices/nm-device.c
index cd2101a521..cd2101a521 100644
--- a/src/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
diff --git a/src/devices/nm-device.h b/src/core/devices/nm-device.h
index 2d53e7b566..2d53e7b566 100644
--- a/src/devices/nm-device.h
+++ b/src/core/devices/nm-device.h
diff --git a/src/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index 6e57e09fa2..6e57e09fa2 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/core/devices/nm-lldp-listener.c
diff --git a/src/devices/nm-lldp-listener.h b/src/core/devices/nm-lldp-listener.h
index 8c83cd6775..8c83cd6775 100644
--- a/src/devices/nm-lldp-listener.h
+++ b/src/core/devices/nm-lldp-listener.h
diff --git a/src/devices/ovs/meson.build b/src/core/devices/ovs/meson.build
index 8457e68aed..8457e68aed 100644
--- a/src/devices/ovs/meson.build
+++ b/src/core/devices/ovs/meson.build
diff --git a/src/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c
index d3a41edde6..d3a41edde6 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.c
+++ b/src/core/devices/ovs/nm-device-ovs-bridge.c
diff --git a/src/devices/ovs/nm-device-ovs-bridge.h b/src/core/devices/ovs/nm-device-ovs-bridge.h
index 304babdce1..304babdce1 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.h
+++ b/src/core/devices/ovs/nm-device-ovs-bridge.h
diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c
index a438fa6345..a438fa6345 100644
--- a/src/devices/ovs/nm-device-ovs-interface.c
+++ b/src/core/devices/ovs/nm-device-ovs-interface.c
diff --git a/src/devices/ovs/nm-device-ovs-interface.h b/src/core/devices/ovs/nm-device-ovs-interface.h
index 902847de40..902847de40 100644
--- a/src/devices/ovs/nm-device-ovs-interface.h
+++ b/src/core/devices/ovs/nm-device-ovs-interface.h
diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c
index d77b475a03..d77b475a03 100644
--- a/src/devices/ovs/nm-device-ovs-port.c
+++ b/src/core/devices/ovs/nm-device-ovs-port.c
diff --git a/src/devices/ovs/nm-device-ovs-port.h b/src/core/devices/ovs/nm-device-ovs-port.h
index 3f5d7793b0..3f5d7793b0 100644
--- a/src/devices/ovs/nm-device-ovs-port.h
+++ b/src/core/devices/ovs/nm-device-ovs-port.h
diff --git a/src/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c
index 2a4667f074..2a4667f074 100644
--- a/src/devices/ovs/nm-ovs-factory.c
+++ b/src/core/devices/ovs/nm-ovs-factory.c
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index be089d05a8..be089d05a8 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/core/devices/ovs/nm-ovsdb.c
diff --git a/src/devices/ovs/nm-ovsdb.h b/src/core/devices/ovs/nm-ovsdb.h
index 100e2ea59c..100e2ea59c 100644
--- a/src/devices/ovs/nm-ovsdb.h
+++ b/src/core/devices/ovs/nm-ovsdb.h
diff --git a/src/devices/team/meson.build b/src/core/devices/team/meson.build
index c2b77cb910..c2b77cb910 100644
--- a/src/devices/team/meson.build
+++ b/src/core/devices/team/meson.build
diff --git a/src/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index 0f481b8a62..0f481b8a62 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/core/devices/team/nm-device-team.c
diff --git a/src/devices/team/nm-device-team.h b/src/core/devices/team/nm-device-team.h
index eabc63e66b..eabc63e66b 100644
--- a/src/devices/team/nm-device-team.h
+++ b/src/core/devices/team/nm-device-team.h
diff --git a/src/devices/team/nm-team-factory.c b/src/core/devices/team/nm-team-factory.c
index eec2a9350a..eec2a9350a 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/core/devices/team/nm-team-factory.c
diff --git a/src/devices/tests/meson.build b/src/core/devices/tests/meson.build
index 1ddd4f8553..1ddd4f8553 100644
--- a/src/devices/tests/meson.build
+++ b/src/core/devices/tests/meson.build
diff --git a/src/devices/tests/test-acd.c b/src/core/devices/tests/test-acd.c
index 8d6c645b05..8d6c645b05 100644
--- a/src/devices/tests/test-acd.c
+++ b/src/core/devices/tests/test-acd.c
diff --git a/src/devices/tests/test-lldp.c b/src/core/devices/tests/test-lldp.c
index 6da4a7697f..6da4a7697f 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/core/devices/tests/test-lldp.c
diff --git a/src/devices/wifi/meson.build b/src/core/devices/wifi/meson.build
index 00404c71f0..00404c71f0 100644
--- a/src/devices/wifi/meson.build
+++ b/src/core/devices/wifi/meson.build
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
index 46169095a8..46169095a8 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/core/devices/wifi/nm-device-iwd.c
diff --git a/src/devices/wifi/nm-device-iwd.h b/src/core/devices/wifi/nm-device-iwd.h
index d4bf5dd61d..d4bf5dd61d 100644
--- a/src/devices/wifi/nm-device-iwd.h
+++ b/src/core/devices/wifi/nm-device-iwd.h
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/core/devices/wifi/nm-device-olpc-mesh.c
index d3874ff16d..d3874ff16d 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/core/devices/wifi/nm-device-olpc-mesh.c
diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/core/devices/wifi/nm-device-olpc-mesh.h
index d31c86fb90..d31c86fb90 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.h
+++ b/src/core/devices/wifi/nm-device-olpc-mesh.h
diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c
index 0780d80b34..0780d80b34 100644
--- a/src/devices/wifi/nm-device-wifi-p2p.c
+++ b/src/core/devices/wifi/nm-device-wifi-p2p.c
diff --git a/src/devices/wifi/nm-device-wifi-p2p.h b/src/core/devices/wifi/nm-device-wifi-p2p.h
index 03e49311e0..03e49311e0 100644
--- a/src/devices/wifi/nm-device-wifi-p2p.h
+++ b/src/core/devices/wifi/nm-device-wifi-p2p.h
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index 2af00196f3..2af00196f3 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/core/devices/wifi/nm-device-wifi.c
diff --git a/src/devices/wifi/nm-device-wifi.h b/src/core/devices/wifi/nm-device-wifi.h
index 713c14806b..713c14806b 100644
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/core/devices/wifi/nm-device-wifi.h
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c
index 2be208c774..2be208c774 100644
--- a/src/devices/wifi/nm-iwd-manager.c
+++ b/src/core/devices/wifi/nm-iwd-manager.c
diff --git a/src/devices/wifi/nm-iwd-manager.h b/src/core/devices/wifi/nm-iwd-manager.h
index 5a0f66680c..5a0f66680c 100644
--- a/src/devices/wifi/nm-iwd-manager.h
+++ b/src/core/devices/wifi/nm-iwd-manager.h
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c
index 78500c0fda..78500c0fda 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/core/devices/wifi/nm-wifi-ap.c
diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/core/devices/wifi/nm-wifi-ap.h
index da360325f6..da360325f6 100644
--- a/src/devices/wifi/nm-wifi-ap.h
+++ b/src/core/devices/wifi/nm-wifi-ap.h
diff --git a/src/devices/wifi/nm-wifi-common.c b/src/core/devices/wifi/nm-wifi-common.c
index e2ef4186b0..e2ef4186b0 100644
--- a/src/devices/wifi/nm-wifi-common.c
+++ b/src/core/devices/wifi/nm-wifi-common.c
diff --git a/src/devices/wifi/nm-wifi-common.h b/src/core/devices/wifi/nm-wifi-common.h
index 203f2a530a..203f2a530a 100644
--- a/src/devices/wifi/nm-wifi-common.h
+++ b/src/core/devices/wifi/nm-wifi-common.h
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/core/devices/wifi/nm-wifi-factory.c
index bbf56abfa9..bbf56abfa9 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/core/devices/wifi/nm-wifi-factory.c
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c
index d67ee96761..d67ee96761 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.c
+++ b/src/core/devices/wifi/nm-wifi-p2p-peer.c
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.h b/src/core/devices/wifi/nm-wifi-p2p-peer.h
index e19cf3d873..e19cf3d873 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.h
+++ b/src/core/devices/wifi/nm-wifi-p2p-peer.h
diff --git a/src/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c
index b487c6f29f..b487c6f29f 100644
--- a/src/devices/wifi/nm-wifi-utils.c
+++ b/src/core/devices/wifi/nm-wifi-utils.c
diff --git a/src/devices/wifi/nm-wifi-utils.h b/src/core/devices/wifi/nm-wifi-utils.h
index e6cec37d4a..e6cec37d4a 100644
--- a/src/devices/wifi/nm-wifi-utils.h
+++ b/src/core/devices/wifi/nm-wifi-utils.h
diff --git a/src/devices/wifi/tests/test-devices-wifi.c b/src/core/devices/wifi/tests/test-devices-wifi.c
index 7be55860b0..7be55860b0 100644
--- a/src/devices/wifi/tests/test-devices-wifi.c
+++ b/src/core/devices/wifi/tests/test-devices-wifi.c
diff --git a/src/devices/wwan/libnm-wwan.ver b/src/core/devices/wwan/libnm-wwan.ver
index c368a5907d..c368a5907d 100644
--- a/src/devices/wwan/libnm-wwan.ver
+++ b/src/core/devices/wwan/libnm-wwan.ver
diff --git a/src/devices/wwan/meson.build b/src/core/devices/wwan/meson.build
index 97252edc08..97252edc08 100644
--- a/src/devices/wwan/meson.build
+++ b/src/core/devices/wwan/meson.build
diff --git a/src/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c
index 5b8b3bd29d..5b8b3bd29d 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/core/devices/wwan/nm-device-modem.c
diff --git a/src/devices/wwan/nm-device-modem.h b/src/core/devices/wwan/nm-device-modem.h
index caabeb6c9c..caabeb6c9c 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/core/devices/wwan/nm-device-modem.h
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c
index 7b3a13a372..7b3a13a372 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/core/devices/wwan/nm-modem-broadband.c
diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/core/devices/wwan/nm-modem-broadband.h
index 5a822f6f63..5a822f6f63 100644
--- a/src/devices/wwan/nm-modem-broadband.h
+++ b/src/core/devices/wwan/nm-modem-broadband.h
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/core/devices/wwan/nm-modem-manager.c
index 65f7c9f932..65f7c9f932 100644
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/core/devices/wwan/nm-modem-manager.c
diff --git a/src/devices/wwan/nm-modem-manager.h b/src/core/devices/wwan/nm-modem-manager.h
index 895d4ced2c..895d4ced2c 100644
--- a/src/devices/wwan/nm-modem-manager.h
+++ b/src/core/devices/wwan/nm-modem-manager.h
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c
index ec53186639..ec53186639 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/core/devices/wwan/nm-modem-ofono.c
diff --git a/src/devices/wwan/nm-modem-ofono.h b/src/core/devices/wwan/nm-modem-ofono.h
index 10b4a38547..10b4a38547 100644
--- a/src/devices/wwan/nm-modem-ofono.h
+++ b/src/core/devices/wwan/nm-modem-ofono.h
diff --git a/src/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c
index 9e16420e7a..9e16420e7a 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/core/devices/wwan/nm-modem.c
diff --git a/src/devices/wwan/nm-modem.h b/src/core/devices/wwan/nm-modem.h
index 4b275cf7b0..4b275cf7b0 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/core/devices/wwan/nm-modem.h
diff --git a/src/devices/wwan/nm-service-providers.c b/src/core/devices/wwan/nm-service-providers.c
index f7c6b5b85f..f7c6b5b85f 100644
--- a/src/devices/wwan/nm-service-providers.c
+++ b/src/core/devices/wwan/nm-service-providers.c
diff --git a/src/devices/wwan/nm-service-providers.h b/src/core/devices/wwan/nm-service-providers.h
index 093bcd5b1f..093bcd5b1f 100644
--- a/src/devices/wwan/nm-service-providers.h
+++ b/src/core/devices/wwan/nm-service-providers.h
diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/core/devices/wwan/nm-wwan-factory.c
index c9c4758419..c9c4758419 100644
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/core/devices/wwan/nm-wwan-factory.c
diff --git a/src/devices/wwan/tests/test-service-providers.c b/src/core/devices/wwan/tests/test-service-providers.c
index ec19d58877..ec19d58877 100644
--- a/src/devices/wwan/tests/test-service-providers.c
+++ b/src/core/devices/wwan/tests/test-service-providers.c
diff --git a/src/devices/wwan/tests/test-service-providers.xml b/src/core/devices/wwan/tests/test-service-providers.xml
index f0ca2debce..f0ca2debce 100644
--- a/src/devices/wwan/tests/test-service-providers.xml
+++ b/src/core/devices/wwan/tests/test-service-providers.xml
diff --git a/src/dhcp/meson.build b/src/core/dhcp/meson.build
index 67f055d9fe..67f055d9fe 100644
--- a/src/dhcp/meson.build
+++ b/src/core/dhcp/meson.build
diff --git a/src/dhcp/nm-dhcp-client-logging.h b/src/core/dhcp/nm-dhcp-client-logging.h
index ecbf5210f8..ecbf5210f8 100644
--- a/src/dhcp/nm-dhcp-client-logging.h
+++ b/src/core/dhcp/nm-dhcp-client-logging.h
diff --git a/src/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index 46ab489595..46ab489595 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/core/dhcp/nm-dhcp-client.c
diff --git a/src/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h
index 05faa9ea5f..05faa9ea5f 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/core/dhcp/nm-dhcp-client.h
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c
index 7e3dd0ec94..7e3dd0ec94 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/core/dhcp/nm-dhcp-dhclient-utils.c
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/core/dhcp/nm-dhcp-dhclient-utils.h
index 3e524ee069..3e524ee069 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/core/dhcp/nm-dhcp-dhclient-utils.h
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c
index 260f400e3e..260f400e3e 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/core/dhcp/nm-dhcp-dhclient.c
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/core/dhcp/nm-dhcp-dhcpcanon.c
index 8e61b6e559..8e61b6e559 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/core/dhcp/nm-dhcp-dhcpcanon.c
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/core/dhcp/nm-dhcp-dhcpcd.c
index b2b5d28bdb..b2b5d28bdb 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/core/dhcp/nm-dhcp-dhcpcd.c
diff --git a/src/dhcp/nm-dhcp-helper-api.h b/src/core/dhcp/nm-dhcp-helper-api.h
index aa1d203a41..aa1d203a41 100644
--- a/src/dhcp/nm-dhcp-helper-api.h
+++ b/src/core/dhcp/nm-dhcp-helper-api.h
diff --git a/src/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c
index 84fa859dc3..84fa859dc3 100644
--- a/src/dhcp/nm-dhcp-helper.c
+++ b/src/core/dhcp/nm-dhcp-helper.c
diff --git a/src/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c
index c90590d58c..c90590d58c 100644
--- a/src/dhcp/nm-dhcp-listener.c
+++ b/src/core/dhcp/nm-dhcp-listener.c
diff --git a/src/dhcp/nm-dhcp-listener.h b/src/core/dhcp/nm-dhcp-listener.h
index 57d3b0fc76..57d3b0fc76 100644
--- a/src/dhcp/nm-dhcp-listener.h
+++ b/src/core/dhcp/nm-dhcp-listener.h
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index 665944d7d6..665944d7d6 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/core/dhcp/nm-dhcp-manager.c
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/core/dhcp/nm-dhcp-manager.h
index 729d6d4e4f..729d6d4e4f 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/core/dhcp/nm-dhcp-manager.h
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c
index 7b4e4605d8..7b4e4605d8 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/core/dhcp/nm-dhcp-nettools.c
diff --git a/src/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c
index 58d3820108..58d3820108 100644
--- a/src/dhcp/nm-dhcp-options.c
+++ b/src/core/dhcp/nm-dhcp-options.c
diff --git a/src/dhcp/nm-dhcp-options.h b/src/core/dhcp/nm-dhcp-options.h
index 6c867c4044..6c867c4044 100644
--- a/src/dhcp/nm-dhcp-options.h
+++ b/src/core/dhcp/nm-dhcp-options.h
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c
index 3d46c2490e..3d46c2490e 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/core/dhcp/nm-dhcp-systemd.c
diff --git a/src/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c
index bf10e2b5c4..bf10e2b5c4 100644
--- a/src/dhcp/nm-dhcp-utils.c
+++ b/src/core/dhcp/nm-dhcp-utils.c
diff --git a/src/dhcp/nm-dhcp-utils.h b/src/core/dhcp/nm-dhcp-utils.h
index c72d961722..c72d961722 100644
--- a/src/dhcp/nm-dhcp-utils.h
+++ b/src/core/dhcp/nm-dhcp-utils.h
diff --git a/src/dhcp/tests/meson.build b/src/core/dhcp/tests/meson.build
index 59a647ccb1..59a647ccb1 100644
--- a/src/dhcp/tests/meson.build
+++ b/src/core/dhcp/tests/meson.build
diff --git a/src/dhcp/tests/test-dhclient-commented-duid.leases b/src/core/dhcp/tests/test-dhclient-commented-duid.leases
index 3e46ae7d0b..3e46ae7d0b 100644
--- a/src/dhcp/tests/test-dhclient-commented-duid.leases
+++ b/src/core/dhcp/tests/test-dhclient-commented-duid.leases
diff --git a/src/dhcp/tests/test-dhclient-duid.leases b/src/core/dhcp/tests/test-dhclient-duid.leases
index 229331d47f..229331d47f 100644
--- a/src/dhcp/tests/test-dhclient-duid.leases
+++ b/src/core/dhcp/tests/test-dhclient-duid.leases
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c
index da24f3c559..da24f3c559 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/core/dhcp/tests/test-dhcp-dhclient.c
diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c
index 50245c791b..50245c791b 100644
--- a/src/dhcp/tests/test-dhcp-utils.c
+++ b/src/core/dhcp/tests/test-dhcp-utils.c
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c
index a560723807..a560723807 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/core/dns/nm-dns-dnsmasq.c
diff --git a/src/dns/nm-dns-dnsmasq.h b/src/core/dns/nm-dns-dnsmasq.h
index d75eef5523..d75eef5523 100644
--- a/src/dns/nm-dns-dnsmasq.h
+++ b/src/core/dns/nm-dns-dnsmasq.h
diff --git a/src/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index ac7021db4b..ac7021db4b 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
diff --git a/src/dns/nm-dns-manager.h b/src/core/dns/nm-dns-manager.h
index 7f104ebe03..7f104ebe03 100644
--- a/src/dns/nm-dns-manager.h
+++ b/src/core/dns/nm-dns-manager.h
diff --git a/src/dns/nm-dns-plugin.c b/src/core/dns/nm-dns-plugin.c
index e59feb3f44..e59feb3f44 100644
--- a/src/dns/nm-dns-plugin.c
+++ b/src/core/dns/nm-dns-plugin.c
diff --git a/src/dns/nm-dns-plugin.h b/src/core/dns/nm-dns-plugin.h
index b5cffccb4d..b5cffccb4d 100644
--- a/src/dns/nm-dns-plugin.h
+++ b/src/core/dns/nm-dns-plugin.h
diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c
index 6d37f4022a..6d37f4022a 100644
--- a/src/dns/nm-dns-systemd-resolved.c
+++ b/src/core/dns/nm-dns-systemd-resolved.c
diff --git a/src/dns/nm-dns-systemd-resolved.h b/src/core/dns/nm-dns-systemd-resolved.h
index ed2528eaa0..ed2528eaa0 100644
--- a/src/dns/nm-dns-systemd-resolved.h
+++ b/src/core/dns/nm-dns-systemd-resolved.h
diff --git a/src/dns/nm-dns-unbound.c b/src/core/dns/nm-dns-unbound.c
index b912475933..b912475933 100644
--- a/src/dns/nm-dns-unbound.c
+++ b/src/core/dns/nm-dns-unbound.c
diff --git a/src/dns/nm-dns-unbound.h b/src/core/dns/nm-dns-unbound.h
index 4129ba9e96..4129ba9e96 100644
--- a/src/dns/nm-dns-unbound.h
+++ b/src/core/dns/nm-dns-unbound.h
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c
index cdc3cd8589..cdc3cd8589 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/core/dnsmasq/nm-dnsmasq-manager.c
diff --git a/src/dnsmasq/nm-dnsmasq-manager.h b/src/core/dnsmasq/nm-dnsmasq-manager.h
index 4f8b3055e6..4f8b3055e6 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.h
+++ b/src/core/dnsmasq/nm-dnsmasq-manager.h
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/core/dnsmasq/nm-dnsmasq-utils.c
index 3e430590ec..3e430590ec 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.c
+++ b/src/core/dnsmasq/nm-dnsmasq-utils.c
diff --git a/src/dnsmasq/nm-dnsmasq-utils.h b/src/core/dnsmasq/nm-dnsmasq-utils.h
index 321035bd27..321035bd27 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.h
+++ b/src/core/dnsmasq/nm-dnsmasq-utils.h
diff --git a/src/dnsmasq/tests/meson.build b/src/core/dnsmasq/tests/meson.build
index 4584086ef7..4584086ef7 100644
--- a/src/dnsmasq/tests/meson.build
+++ b/src/core/dnsmasq/tests/meson.build
diff --git a/src/dnsmasq/tests/test-dnsmasq-utils.c b/src/core/dnsmasq/tests/test-dnsmasq-utils.c
index 4fa1757609..4fa1757609 100644
--- a/src/dnsmasq/tests/test-dnsmasq-utils.c
+++ b/src/core/dnsmasq/tests/test-dnsmasq-utils.c
diff --git a/src/initrd/meson.build b/src/core/initrd/meson.build
index c056f3c221..c056f3c221 100644
--- a/src/initrd/meson.build
+++ b/src/core/initrd/meson.build
diff --git a/src/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c
index 1a33713eaf..1a33713eaf 100644
--- a/src/initrd/nm-initrd-generator.c
+++ b/src/core/initrd/nm-initrd-generator.c
diff --git a/src/initrd/nm-initrd-generator.h b/src/core/initrd/nm-initrd-generator.h
index 69c24b1b0b..69c24b1b0b 100644
--- a/src/initrd/nm-initrd-generator.h
+++ b/src/core/initrd/nm-initrd-generator.h
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c
index a8ad2b1b24..a8ad2b1b24 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/core/initrd/nmi-cmdline-reader.c
diff --git a/src/initrd/nmi-dt-reader.c b/src/core/initrd/nmi-dt-reader.c
index b3646b36a4..b3646b36a4 100644
--- a/src/initrd/nmi-dt-reader.c
+++ b/src/core/initrd/nmi-dt-reader.c
diff --git a/src/initrd/nmi-ibft-reader.c b/src/core/initrd/nmi-ibft-reader.c
index 40ac7db2bf..40ac7db2bf 100644
--- a/src/initrd/nmi-ibft-reader.c
+++ b/src/core/initrd/nmi-ibft-reader.c
diff --git a/src/initrd/tests/meson.build b/src/core/initrd/tests/meson.build
index 1d0908b9bc..1d0908b9bc 100644
--- a/src/initrd/tests/meson.build
+++ b/src/core/initrd/tests/meson.build
diff --git a/src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
index 2303dbdcbc..2303dbdcbc 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
index 5ed7b71958..5ed7b71958 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
index 1970856e09..1970856e09 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
index d526f3244f..d526f3244f 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-dhcp/class/net/eth0/address b/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-dhcp/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-dhcp/class/net/eth1/address b/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-dhcp/class/net/eth1/address
+++ b/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
index e440e5c842..e440e5c842 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
index e440e5c842..e440e5c842 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
index ac3a6a2ab3..ac3a6a2ab3 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
diff --git a/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath b/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
index 6f069ae0fc..6f069ae0fc 100644
--- a/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
+++ b/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
index 034d423ee3..034d423ee3 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
index 25982d6f42..25982d6f42 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
index db88070270..db88070270 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
index 7bde8641b9..7bde8641b9 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
index f108ba9b39..f108ba9b39 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
index fe0f76b8ed..fe0f76b8ed 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
index b34f9f968e..b34f9f968e 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
index f036183536..f036183536 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
index f3e5805251..f3e5805251 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
index d441cd83fc..d441cd83fc 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
index f76dd238ad..f76dd238ad 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
index a2a4b2e8de..a2a4b2e8de 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
index c0e0e3303e..c0e0e3303e 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
index f76dd238ad..f76dd238ad 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
index df3c9d9f4c..df3c9d9f4c 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
index c983e75212..c983e75212 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
index c983e75212..c983e75212 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
index 88eaddfe14..88eaddfe14 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
diff --git a/src/initrd/tests/sysfs-static/class/net/eth0/address b/src/core/initrd/tests/sysfs-static/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-static/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-static/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-static/class/net/eth1/address b/src/core/initrd/tests/sysfs-static/class/net/eth1/address
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-static/class/net/eth1/address
+++ b/src/core/initrd/tests/sysfs-static/class/net/eth1/address
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
index e440e5c842..e440e5c842 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/lun b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/lun
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/port b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/port
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
index ac3a6a2ab3..ac3a6a2ab3 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
diff --git a/src/initrd/tests/sysfs-vlan/class/net/eth0/address b/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-vlan/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
index 4923230c8c..4923230c8c 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
index cabf43b5dd..cabf43b5dd 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
index 5a279b41f0..5a279b41f0 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
index d800886d9c..d800886d9c 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
index 8e9cd2c42c..8e9cd2c42c 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
index a32ce01ba1..a32ce01ba1 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
index f309ca6a0a..f309ca6a0a 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
index f0e6115796..f0e6115796 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs/class/net/eth0/address b/src/core/initrd/tests/sysfs/class/net/eth0/address
index 1f2f610ecc..1f2f610ecc 100644
--- a/src/initrd/tests/sysfs/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs/class/net/eth2/address b/src/core/initrd/tests/sysfs/class/net/eth2/address
index 6ec1078ab8..6ec1078ab8 100644
--- a/src/initrd/tests/sysfs/class/net/eth2/address
+++ b/src/core/initrd/tests/sysfs/class/net/eth2/address
diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
index 590d9cd211..590d9cd211 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
index 35d4d09ce2..35d4d09ce2 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
index e3a5d7ef22..e3a5d7ef22 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
index 98a0d79742..98a0d79742 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
index 7f378f8f97..7f378f8f97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
index 3ed5163c84..3ed5163c84 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
index 98a0d79742..98a0d79742 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
index f24413198a..f24413198a 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
index b8626c4cff..b8626c4cff 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
index 900731ffd5..900731ffd5 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
index e7511d5af4..e7511d5af4 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
index 1f6c5c9547..1f6c5c9547 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
index 5df934545e..5df934545e 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
index 7cc86ad136..7cc86ad136 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
index 61ef5585ef..61ef5585ef 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
index 2096f194ff..2096f194ff 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
index 5dc539d584..5dc539d584 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/index b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index
index 0cfbf08886..0cfbf08886 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
index 61ef5585ef..61ef5585ef 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
index 2fc3d5253b..2fc3d5253b 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
index a45fd52cc5..a45fd52cc5 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
index 6fa8c74292..6fa8c74292 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
index a7269ff5e9..a7269ff5e9 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
index d30f9e9fdb..d30f9e9fdb 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/flags b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/index b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
index 337b5a0f3a..337b5a0f3a 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
index 4aff93986c..4aff93986c 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
index a26fb64927..a26fb64927 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
index 908be27f4b..908be27f4b 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
index fca9e24bd5..fca9e24bd5 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/chap-type b/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/chap-type
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/flags b/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs/firmware/ibft/target0/index
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
index 994b6e9c69..994b6e9c69 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun
index 7c295bd444..7c295bd444 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc b/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs/firmware/ibft/target0/port
index 53f0295f3f..53f0295f3f 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/chap-type b/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/chap-type
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/flags b/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/index b/src/core/initrd/tests/sysfs/firmware/ibft/target2/index
index 0cfbf08886..0cfbf08886 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
index a210477e6d..a210477e6d 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/lun b/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun
index 7c295bd444..7c295bd444 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/lun
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc b/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
index 0cfbf08886..0cfbf08886 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/port b/src/core/initrd/tests/sysfs/firmware/ibft/target2/port
index 53f0295f3f..53f0295f3f 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/port
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/port
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/target-name b/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name
index f409432041..f409432041 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/target-name
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c
index 8e62a2a467..8e62a2a467 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/core/initrd/tests/test-cmdline-reader.c
diff --git a/src/initrd/tests/test-dt-reader.c b/src/core/initrd/tests/test-dt-reader.c
index 55e2b1f116..55e2b1f116 100644
--- a/src/initrd/tests/test-dt-reader.c
+++ b/src/core/initrd/tests/test-dt-reader.c
diff --git a/src/initrd/tests/test-ibft-reader.c b/src/core/initrd/tests/test-ibft-reader.c
index b0d465390d..b0d465390d 100644
--- a/src/initrd/tests/test-ibft-reader.c
+++ b/src/core/initrd/tests/test-ibft-reader.c
diff --git a/src/main-utils.c b/src/core/main-utils.c
index 3bc2801417..3bc2801417 100644
--- a/src/main-utils.c
+++ b/src/core/main-utils.c
diff --git a/src/main-utils.h b/src/core/main-utils.h
index 0cd4ee4750..0cd4ee4750 100644
--- a/src/main-utils.h
+++ b/src/core/main-utils.h
diff --git a/src/main.c b/src/core/main.c
index dc7dcaf60b..dc7dcaf60b 100644
--- a/src/main.c
+++ b/src/core/main.c
diff --git a/src/meson.build b/src/core/meson.build
index b3eddadcdd..b3eddadcdd 100644
--- a/src/meson.build
+++ b/src/core/meson.build
diff --git a/src/ndisc/nm-fake-ndisc.c b/src/core/ndisc/nm-fake-ndisc.c
index bd9f5f7e90..bd9f5f7e90 100644
--- a/src/ndisc/nm-fake-ndisc.c
+++ b/src/core/ndisc/nm-fake-ndisc.c
diff --git a/src/ndisc/nm-fake-ndisc.h b/src/core/ndisc/nm-fake-ndisc.h
index 47f4056070..47f4056070 100644
--- a/src/ndisc/nm-fake-ndisc.h
+++ b/src/core/ndisc/nm-fake-ndisc.h
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c
index 22695c32db..22695c32db 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/core/ndisc/nm-lndp-ndisc.c
diff --git a/src/ndisc/nm-lndp-ndisc.h b/src/core/ndisc/nm-lndp-ndisc.h
index a275be3e88..a275be3e88 100644
--- a/src/ndisc/nm-lndp-ndisc.h
+++ b/src/core/ndisc/nm-lndp-ndisc.h
diff --git a/src/ndisc/nm-ndisc-private.h b/src/core/ndisc/nm-ndisc-private.h
index a79a920b91..a79a920b91 100644
--- a/src/ndisc/nm-ndisc-private.h
+++ b/src/core/ndisc/nm-ndisc-private.h
diff --git a/src/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
index f8805c02da..f8805c02da 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/core/ndisc/nm-ndisc.c
diff --git a/src/ndisc/nm-ndisc.h b/src/core/ndisc/nm-ndisc.h
index 0578c45b65..0578c45b65 100644
--- a/src/ndisc/nm-ndisc.h
+++ b/src/core/ndisc/nm-ndisc.h
diff --git a/src/ndisc/tests/meson.build b/src/core/ndisc/tests/meson.build
index 349eebbac8..349eebbac8 100644
--- a/src/ndisc/tests/meson.build
+++ b/src/core/ndisc/tests/meson.build
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/core/ndisc/tests/test-ndisc-fake.c
index dfb0b37b94..dfb0b37b94 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/core/ndisc/tests/test-ndisc-fake.c
diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/core/ndisc/tests/test-ndisc-linux.c
index 7e5e258bd6..7e5e258bd6 100644
--- a/src/ndisc/tests/test-ndisc-linux.c
+++ b/src/core/ndisc/tests/test-ndisc-linux.c
diff --git a/src/nm-act-request.c b/src/core/nm-act-request.c
index aa70ac7750..aa70ac7750 100644
--- a/src/nm-act-request.c
+++ b/src/core/nm-act-request.c
diff --git a/src/nm-act-request.h b/src/core/nm-act-request.h
index e962ee7225..e962ee7225 100644
--- a/src/nm-act-request.h
+++ b/src/core/nm-act-request.h
diff --git a/src/nm-active-connection.c b/src/core/nm-active-connection.c
index a8b8e2f39c..a8b8e2f39c 100644
--- a/src/nm-active-connection.c
+++ b/src/core/nm-active-connection.c
diff --git a/src/nm-active-connection.h b/src/core/nm-active-connection.h
index 9c39835d08..9c39835d08 100644
--- a/src/nm-active-connection.h
+++ b/src/core/nm-active-connection.h
diff --git a/src/nm-audit-manager.c b/src/core/nm-audit-manager.c
index 527a3904f4..527a3904f4 100644
--- a/src/nm-audit-manager.c
+++ b/src/core/nm-audit-manager.c
diff --git a/src/nm-audit-manager.h b/src/core/nm-audit-manager.h
index 65076513bc..65076513bc 100644
--- a/src/nm-audit-manager.h
+++ b/src/core/nm-audit-manager.h
diff --git a/src/nm-auth-manager.c b/src/core/nm-auth-manager.c
index 1cb4834a0e..1cb4834a0e 100644
--- a/src/nm-auth-manager.c
+++ b/src/core/nm-auth-manager.c
diff --git a/src/nm-auth-manager.h b/src/core/nm-auth-manager.h
index 8dc821df7e..8dc821df7e 100644
--- a/src/nm-auth-manager.h
+++ b/src/core/nm-auth-manager.h
diff --git a/src/nm-auth-utils.c b/src/core/nm-auth-utils.c
index b4bbd82410..b4bbd82410 100644
--- a/src/nm-auth-utils.c
+++ b/src/core/nm-auth-utils.c
diff --git a/src/nm-auth-utils.h b/src/core/nm-auth-utils.h
index 309c5b513f..309c5b513f 100644
--- a/src/nm-auth-utils.h
+++ b/src/core/nm-auth-utils.h
diff --git a/src/nm-checkpoint-manager.c b/src/core/nm-checkpoint-manager.c
index 5d36213b21..5d36213b21 100644
--- a/src/nm-checkpoint-manager.c
+++ b/src/core/nm-checkpoint-manager.c
diff --git a/src/nm-checkpoint-manager.h b/src/core/nm-checkpoint-manager.h
index 051cfd521f..051cfd521f 100644
--- a/src/nm-checkpoint-manager.h
+++ b/src/core/nm-checkpoint-manager.h
diff --git a/src/nm-checkpoint.c b/src/core/nm-checkpoint.c
index b26f7e8081..b26f7e8081 100644
--- a/src/nm-checkpoint.c
+++ b/src/core/nm-checkpoint.c
diff --git a/src/nm-checkpoint.h b/src/core/nm-checkpoint.h
index 7e2fff590d..7e2fff590d 100644
--- a/src/nm-checkpoint.h
+++ b/src/core/nm-checkpoint.h
diff --git a/src/nm-config-data.c b/src/core/nm-config-data.c
index eb891c512d..eb891c512d 100644
--- a/src/nm-config-data.c
+++ b/src/core/nm-config-data.c
diff --git a/src/nm-config-data.h b/src/core/nm-config-data.h
index c15e664270..c15e664270 100644
--- a/src/nm-config-data.h
+++ b/src/core/nm-config-data.h
diff --git a/src/nm-config.c b/src/core/nm-config.c
index da37945c1e..da37945c1e 100644
--- a/src/nm-config.c
+++ b/src/core/nm-config.c
diff --git a/src/nm-config.h b/src/core/nm-config.h
index f4f1bf5d9a..f4f1bf5d9a 100644
--- a/src/nm-config.h
+++ b/src/core/nm-config.h
diff --git a/src/nm-connectivity.c b/src/core/nm-connectivity.c
index 3cd1d4b8cd..3cd1d4b8cd 100644
--- a/src/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
diff --git a/src/nm-connectivity.h b/src/core/nm-connectivity.h
index 620eff3535..620eff3535 100644
--- a/src/nm-connectivity.h
+++ b/src/core/nm-connectivity.h
diff --git a/src/nm-core-utils.c b/src/core/nm-core-utils.c
index 81879be876..81879be876 100644
--- a/src/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
diff --git a/src/nm-core-utils.h b/src/core/nm-core-utils.h
index 5c8bac9c80..5c8bac9c80 100644
--- a/src/nm-core-utils.h
+++ b/src/core/nm-core-utils.h
diff --git a/src/nm-dbus-manager.c b/src/core/nm-dbus-manager.c
index 00cb6a9ff7..00cb6a9ff7 100644
--- a/src/nm-dbus-manager.c
+++ b/src/core/nm-dbus-manager.c
diff --git a/src/nm-dbus-manager.h b/src/core/nm-dbus-manager.h
index 5d20e0d54d..5d20e0d54d 100644
--- a/src/nm-dbus-manager.h
+++ b/src/core/nm-dbus-manager.h
diff --git a/src/nm-dbus-object.c b/src/core/nm-dbus-object.c
index f49610ab91..f49610ab91 100644
--- a/src/nm-dbus-object.c
+++ b/src/core/nm-dbus-object.c
diff --git a/src/nm-dbus-object.h b/src/core/nm-dbus-object.h
index e7deef539f..e7deef539f 100644
--- a/src/nm-dbus-object.h
+++ b/src/core/nm-dbus-object.h
diff --git a/src/nm-dbus-utils.c b/src/core/nm-dbus-utils.c
index d5e8cb3aaf..d5e8cb3aaf 100644
--- a/src/nm-dbus-utils.c
+++ b/src/core/nm-dbus-utils.c
diff --git a/src/nm-dbus-utils.h b/src/core/nm-dbus-utils.h
index 4817797341..4817797341 100644
--- a/src/nm-dbus-utils.h
+++ b/src/core/nm-dbus-utils.h
diff --git a/src/nm-dcb.c b/src/core/nm-dcb.c
index d7c047b3ba..d7c047b3ba 100644
--- a/src/nm-dcb.c
+++ b/src/core/nm-dcb.c
diff --git a/src/nm-dcb.h b/src/core/nm-dcb.h
index 3024c30abf..3024c30abf 100644
--- a/src/nm-dcb.h
+++ b/src/core/nm-dcb.h
diff --git a/src/nm-dhcp-config.c b/src/core/nm-dhcp-config.c
index 3788e4f35e..3788e4f35e 100644
--- a/src/nm-dhcp-config.c
+++ b/src/core/nm-dhcp-config.c
diff --git a/src/nm-dhcp-config.h b/src/core/nm-dhcp-config.h
index dbd0b5e725..dbd0b5e725 100644
--- a/src/nm-dhcp-config.h
+++ b/src/core/nm-dhcp-config.h
diff --git a/src/nm-dispatcher.c b/src/core/nm-dispatcher.c
index 3b0763d11e..3b0763d11e 100644
--- a/src/nm-dispatcher.c
+++ b/src/core/nm-dispatcher.c
diff --git a/src/nm-dispatcher.h b/src/core/nm-dispatcher.h
index 202f44b04b..202f44b04b 100644
--- a/src/nm-dispatcher.h
+++ b/src/core/nm-dispatcher.h
diff --git a/src/nm-firewall-manager.c b/src/core/nm-firewall-manager.c
index 7ae9ee897e..7ae9ee897e 100644
--- a/src/nm-firewall-manager.c
+++ b/src/core/nm-firewall-manager.c
diff --git a/src/nm-firewall-manager.h b/src/core/nm-firewall-manager.h
index 3b16585484..3b16585484 100644
--- a/src/nm-firewall-manager.h
+++ b/src/core/nm-firewall-manager.h
diff --git a/src/nm-hostname-manager.c b/src/core/nm-hostname-manager.c
index 413b756af8..413b756af8 100644
--- a/src/nm-hostname-manager.c
+++ b/src/core/nm-hostname-manager.c
diff --git a/src/nm-hostname-manager.h b/src/core/nm-hostname-manager.h
index f88501f0d5..f88501f0d5 100644
--- a/src/nm-hostname-manager.h
+++ b/src/core/nm-hostname-manager.h
diff --git a/src/nm-iface-helper.c b/src/core/nm-iface-helper.c
index e5d8596780..e5d8596780 100644
--- a/src/nm-iface-helper.c
+++ b/src/core/nm-iface-helper.c
diff --git a/src/nm-ip-config.c b/src/core/nm-ip-config.c
index d9bbf8509d..d9bbf8509d 100644
--- a/src/nm-ip-config.c
+++ b/src/core/nm-ip-config.c
diff --git a/src/nm-ip-config.h b/src/core/nm-ip-config.h
index d5f4e5a457..d5f4e5a457 100644
--- a/src/nm-ip-config.h
+++ b/src/core/nm-ip-config.h
diff --git a/src/nm-ip4-config.c b/src/core/nm-ip4-config.c
index 27847af77f..27847af77f 100644
--- a/src/nm-ip4-config.c
+++ b/src/core/nm-ip4-config.c
diff --git a/src/nm-ip4-config.h b/src/core/nm-ip4-config.h
index c8bad3a8d2..c8bad3a8d2 100644
--- a/src/nm-ip4-config.h
+++ b/src/core/nm-ip4-config.h
diff --git a/src/nm-ip6-config.c b/src/core/nm-ip6-config.c
index 54488e37d9..54488e37d9 100644
--- a/src/nm-ip6-config.c
+++ b/src/core/nm-ip6-config.c
diff --git a/src/nm-ip6-config.h b/src/core/nm-ip6-config.h
index a5a28a1afe..a5a28a1afe 100644
--- a/src/nm-ip6-config.h
+++ b/src/core/nm-ip6-config.h
diff --git a/src/nm-keep-alive.c b/src/core/nm-keep-alive.c
index 2b6e19e8ef..2b6e19e8ef 100644
--- a/src/nm-keep-alive.c
+++ b/src/core/nm-keep-alive.c
diff --git a/src/nm-keep-alive.h b/src/core/nm-keep-alive.h
index 98c13273fb..98c13273fb 100644
--- a/src/nm-keep-alive.h
+++ b/src/core/nm-keep-alive.h
diff --git a/src/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index a5c8d52337..a5c8d52337 100644
--- a/src/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
diff --git a/src/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index da9fd93a96..da9fd93a96 100644
--- a/src/nm-l3-config-data.h
+++ b/src/core/nm-l3-config-data.h
diff --git a/src/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c
index 1ef25b2511..1ef25b2511 100644
--- a/src/nm-l3-ipv4ll.c
+++ b/src/core/nm-l3-ipv4ll.c
diff --git a/src/nm-l3-ipv4ll.h b/src/core/nm-l3-ipv4ll.h
index 4509f95c4f..4509f95c4f 100644
--- a/src/nm-l3-ipv4ll.h
+++ b/src/core/nm-l3-ipv4ll.h
diff --git a/src/nm-l3cfg.c b/src/core/nm-l3cfg.c
index acdb176c3b..acdb176c3b 100644
--- a/src/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
diff --git a/src/nm-l3cfg.h b/src/core/nm-l3cfg.h
index e83bdc9163..e83bdc9163 100644
--- a/src/nm-l3cfg.h
+++ b/src/core/nm-l3cfg.h
diff --git a/src/nm-logging.c b/src/core/nm-logging.c
index 11affbfb9a..11affbfb9a 100644
--- a/src/nm-logging.c
+++ b/src/core/nm-logging.c
diff --git a/src/nm-logging.h b/src/core/nm-logging.h
index cfaffa9885..cfaffa9885 100644
--- a/src/nm-logging.h
+++ b/src/core/nm-logging.h
diff --git a/src/nm-manager.c b/src/core/nm-manager.c
index 3b093dd086..3b093dd086 100644
--- a/src/nm-manager.c
+++ b/src/core/nm-manager.c
diff --git a/src/nm-manager.h b/src/core/nm-manager.h
index fcb29cf562..fcb29cf562 100644
--- a/src/nm-manager.h
+++ b/src/core/nm-manager.h
diff --git a/src/nm-netns.c b/src/core/nm-netns.c
index 879bdee237..879bdee237 100644
--- a/src/nm-netns.c
+++ b/src/core/nm-netns.c
diff --git a/src/nm-netns.h b/src/core/nm-netns.h
index 5ae0c294b3..5ae0c294b3 100644
--- a/src/nm-netns.h
+++ b/src/core/nm-netns.h
diff --git a/src/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c
index 7c1c2c56a5..7c1c2c56a5 100644
--- a/src/nm-pacrunner-manager.c
+++ b/src/core/nm-pacrunner-manager.c
diff --git a/src/nm-pacrunner-manager.h b/src/core/nm-pacrunner-manager.h
index b3c3bdb702..b3c3bdb702 100644
--- a/src/nm-pacrunner-manager.h
+++ b/src/core/nm-pacrunner-manager.h
diff --git a/src/nm-policy.c b/src/core/nm-policy.c
index 114cd7790a..114cd7790a 100644
--- a/src/nm-policy.c
+++ b/src/core/nm-policy.c
diff --git a/src/nm-policy.h b/src/core/nm-policy.h
index feac9ef712..feac9ef712 100644
--- a/src/nm-policy.h
+++ b/src/core/nm-policy.h
diff --git a/src/nm-proxy-config.c b/src/core/nm-proxy-config.c
index 8e8c9030a6..8e8c9030a6 100644
--- a/src/nm-proxy-config.c
+++ b/src/core/nm-proxy-config.c
diff --git a/src/nm-proxy-config.h b/src/core/nm-proxy-config.h
index 305e2de634..305e2de634 100644
--- a/src/nm-proxy-config.h
+++ b/src/core/nm-proxy-config.h
diff --git a/src/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c
index 4b3e18d74b..4b3e18d74b 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/core/nm-rfkill-manager.c
diff --git a/src/nm-rfkill-manager.h b/src/core/nm-rfkill-manager.h
index a49620bdd4..a49620bdd4 100644
--- a/src/nm-rfkill-manager.h
+++ b/src/core/nm-rfkill-manager.h
diff --git a/src/nm-session-monitor.c b/src/core/nm-session-monitor.c
index edd89b6b57..edd89b6b57 100644
--- a/src/nm-session-monitor.c
+++ b/src/core/nm-session-monitor.c
diff --git a/src/nm-session-monitor.h b/src/core/nm-session-monitor.h
index e42311d8dc..e42311d8dc 100644
--- a/src/nm-session-monitor.h
+++ b/src/core/nm-session-monitor.h
diff --git a/src/nm-sleep-monitor.c b/src/core/nm-sleep-monitor.c
index 2a10f92c5c..2a10f92c5c 100644
--- a/src/nm-sleep-monitor.c
+++ b/src/core/nm-sleep-monitor.c
diff --git a/src/nm-sleep-monitor.h b/src/core/nm-sleep-monitor.h
index a7c1008d8e..a7c1008d8e 100644
--- a/src/nm-sleep-monitor.h
+++ b/src/core/nm-sleep-monitor.h
diff --git a/src/nm-test-utils-core.h b/src/core/nm-test-utils-core.h
index 0c9cfa9ef7..0c9cfa9ef7 100644
--- a/src/nm-test-utils-core.h
+++ b/src/core/nm-test-utils-core.h
diff --git a/src/nm-types.h b/src/core/nm-types.h
index d24031eae7..d24031eae7 100644
--- a/src/nm-types.h
+++ b/src/core/nm-types.h
diff --git a/src/org.freedesktop.NetworkManager.conf b/src/core/org.freedesktop.NetworkManager.conf
index 5c2af2e0e5..5c2af2e0e5 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/core/org.freedesktop.NetworkManager.conf
diff --git a/src/platform/linux/nl802154.h b/src/core/platform/linux/nl802154.h
index c21bd0791c..c21bd0791c 100644
--- a/src/platform/linux/nl802154.h
+++ b/src/core/platform/linux/nl802154.h
diff --git a/src/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c
index 5bb0b426fe..5bb0b426fe 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/core/platform/nm-fake-platform.c
diff --git a/src/platform/nm-fake-platform.h b/src/core/platform/nm-fake-platform.h
index c3ec892154..c3ec892154 100644
--- a/src/platform/nm-fake-platform.h
+++ b/src/core/platform/nm-fake-platform.h
diff --git a/src/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index 505cf82cb6..505cf82cb6 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
diff --git a/src/platform/nm-linux-platform.h b/src/core/platform/nm-linux-platform.h
index 98935b98dc..98935b98dc 100644
--- a/src/platform/nm-linux-platform.h
+++ b/src/core/platform/nm-linux-platform.h
diff --git a/src/platform/nm-netlink.c b/src/core/platform/nm-netlink.c
index 965a73bc50..965a73bc50 100644
--- a/src/platform/nm-netlink.c
+++ b/src/core/platform/nm-netlink.c
diff --git a/src/platform/nm-netlink.h b/src/core/platform/nm-netlink.h
index 52283e9f79..52283e9f79 100644
--- a/src/platform/nm-netlink.h
+++ b/src/core/platform/nm-netlink.h
diff --git a/src/platform/nm-platform-private.h b/src/core/platform/nm-platform-private.h
index d99e330b59..d99e330b59 100644
--- a/src/platform/nm-platform-private.h
+++ b/src/core/platform/nm-platform-private.h
diff --git a/src/platform/nm-platform-utils.c b/src/core/platform/nm-platform-utils.c
index ea45050d16..ea45050d16 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/core/platform/nm-platform-utils.c
diff --git a/src/platform/nm-platform-utils.h b/src/core/platform/nm-platform-utils.h
index 076a2c7d59..076a2c7d59 100644
--- a/src/platform/nm-platform-utils.h
+++ b/src/core/platform/nm-platform-utils.h
diff --git a/src/platform/nm-platform.c b/src/core/platform/nm-platform.c
index cd58211594..cd58211594 100644
--- a/src/platform/nm-platform.c
+++ b/src/core/platform/nm-platform.c
diff --git a/src/platform/nm-platform.h b/src/core/platform/nm-platform.h
index 25a741166e..25a741166e 100644
--- a/src/platform/nm-platform.h
+++ b/src/core/platform/nm-platform.h
diff --git a/src/platform/nmp-netns.c b/src/core/platform/nmp-netns.c
index 07f7a7c964..07f7a7c964 100644
--- a/src/platform/nmp-netns.c
+++ b/src/core/platform/nmp-netns.c
diff --git a/src/platform/nmp-netns.h b/src/core/platform/nmp-netns.h
index 2516a79eef..2516a79eef 100644
--- a/src/platform/nmp-netns.h
+++ b/src/core/platform/nmp-netns.h
diff --git a/src/platform/nmp-object.c b/src/core/platform/nmp-object.c
index cc18e49527..cc18e49527 100644
--- a/src/platform/nmp-object.c
+++ b/src/core/platform/nmp-object.c
diff --git a/src/platform/nmp-object.h b/src/core/platform/nmp-object.h
index 5480f8391b..5480f8391b 100644
--- a/src/platform/nmp-object.h
+++ b/src/core/platform/nmp-object.h
diff --git a/src/platform/nmp-rules-manager.c b/src/core/platform/nmp-rules-manager.c
index d139c9a308..d139c9a308 100644
--- a/src/platform/nmp-rules-manager.c
+++ b/src/core/platform/nmp-rules-manager.c
diff --git a/src/platform/nmp-rules-manager.h b/src/core/platform/nmp-rules-manager.h
index 29c1295c4d..29c1295c4d 100644
--- a/src/platform/nmp-rules-manager.h
+++ b/src/core/platform/nmp-rules-manager.h
diff --git a/src/platform/tests/meson.build b/src/core/platform/tests/meson.build
index f96850cc26..f96850cc26 100644
--- a/src/platform/tests/meson.build
+++ b/src/core/platform/tests/meson.build
diff --git a/src/platform/tests/monitor.c b/src/core/platform/tests/monitor.c
index a8d0fad241..a8d0fad241 100644
--- a/src/platform/tests/monitor.c
+++ b/src/core/platform/tests/monitor.c
diff --git a/src/platform/tests/test-address.c b/src/core/platform/tests/test-address.c
index 5ea30a572f..5ea30a572f 100644
--- a/src/platform/tests/test-address.c
+++ b/src/core/platform/tests/test-address.c
diff --git a/src/platform/tests/test-cleanup.c b/src/core/platform/tests/test-cleanup.c
index c364bfa1df..c364bfa1df 100644
--- a/src/platform/tests/test-cleanup.c
+++ b/src/core/platform/tests/test-cleanup.c
diff --git a/src/platform/tests/test-common.c b/src/core/platform/tests/test-common.c
index f5b2128b3b..f5b2128b3b 100644
--- a/src/platform/tests/test-common.c
+++ b/src/core/platform/tests/test-common.c
diff --git a/src/platform/tests/test-common.h b/src/core/platform/tests/test-common.h
index 3a4bcb3b66..3a4bcb3b66 100644
--- a/src/platform/tests/test-common.h
+++ b/src/core/platform/tests/test-common.h
diff --git a/src/platform/tests/test-link.c b/src/core/platform/tests/test-link.c
index 5fd67ec41f..5fd67ec41f 100644
--- a/src/platform/tests/test-link.c
+++ b/src/core/platform/tests/test-link.c
diff --git a/src/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c
index e61e6b093b..e61e6b093b 100644
--- a/src/platform/tests/test-nmp-object.c
+++ b/src/core/platform/tests/test-nmp-object.c
diff --git a/src/platform/tests/test-platform-general.c b/src/core/platform/tests/test-platform-general.c
index 703c886e31..703c886e31 100644
--- a/src/platform/tests/test-platform-general.c
+++ b/src/core/platform/tests/test-platform-general.c
diff --git a/src/platform/tests/test-route.c b/src/core/platform/tests/test-route.c
index 1305e586f7..1305e586f7 100644
--- a/src/platform/tests/test-route.c
+++ b/src/core/platform/tests/test-route.c
diff --git a/src/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c
index 4cbe4f5d82..4cbe4f5d82 100644
--- a/src/platform/tests/test-tc.c
+++ b/src/core/platform/tests/test-tc.c
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/core/platform/wifi/nm-wifi-utils-nl80211.c
index 457c6b8e5a..457c6b8e5a 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.c
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.h b/src/core/platform/wifi/nm-wifi-utils-nl80211.h
index 59fc1accaa..59fc1accaa 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.h
+++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.h
diff --git a/src/platform/wifi/nm-wifi-utils-private.h b/src/core/platform/wifi/nm-wifi-utils-private.h
index 703ef66a82..703ef66a82 100644
--- a/src/platform/wifi/nm-wifi-utils-private.h
+++ b/src/core/platform/wifi/nm-wifi-utils-private.h
diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c
index fde48cc652..fde48cc652 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/core/platform/wifi/nm-wifi-utils-wext.c
diff --git a/src/platform/wifi/nm-wifi-utils-wext.h b/src/core/platform/wifi/nm-wifi-utils-wext.h
index 210b87e5bf..210b87e5bf 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.h
+++ b/src/core/platform/wifi/nm-wifi-utils-wext.h
diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/core/platform/wifi/nm-wifi-utils.c
index 92fbc200d5..92fbc200d5 100644
--- a/src/platform/wifi/nm-wifi-utils.c
+++ b/src/core/platform/wifi/nm-wifi-utils.c
diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/core/platform/wifi/nm-wifi-utils.h
index 2febd52803..2febd52803 100644
--- a/src/platform/wifi/nm-wifi-utils.h
+++ b/src/core/platform/wifi/nm-wifi-utils.h
diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/core/platform/wpan/nm-wpan-utils.c
index 6f6514148c..6f6514148c 100644
--- a/src/platform/wpan/nm-wpan-utils.c
+++ b/src/core/platform/wpan/nm-wpan-utils.c
diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/core/platform/wpan/nm-wpan-utils.h
index b30c89a6d4..b30c89a6d4 100644
--- a/src/platform/wpan/nm-wpan-utils.h
+++ b/src/core/platform/wpan/nm-wpan-utils.h
diff --git a/src/ppp/meson.build b/src/core/ppp/meson.build
index 181a6bef0b..181a6bef0b 100644
--- a/src/ppp/meson.build
+++ b/src/core/ppp/meson.build
diff --git a/src/ppp/nm-ppp-manager-call.c b/src/core/ppp/nm-ppp-manager-call.c
index 34c3d06de9..34c3d06de9 100644
--- a/src/ppp/nm-ppp-manager-call.c
+++ b/src/core/ppp/nm-ppp-manager-call.c
diff --git a/src/ppp/nm-ppp-manager-call.h b/src/core/ppp/nm-ppp-manager-call.h
index d17419ba0c..d17419ba0c 100644
--- a/src/ppp/nm-ppp-manager-call.h
+++ b/src/core/ppp/nm-ppp-manager-call.h
diff --git a/src/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c
index a2ac2a23eb..a2ac2a23eb 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/core/ppp/nm-ppp-manager.c
diff --git a/src/ppp/nm-ppp-manager.h b/src/core/ppp/nm-ppp-manager.h
index b130608c39..b130608c39 100644
--- a/src/ppp/nm-ppp-manager.h
+++ b/src/core/ppp/nm-ppp-manager.h
diff --git a/src/ppp/nm-ppp-plugin-api.h b/src/core/ppp/nm-ppp-plugin-api.h
index a105690c78..a105690c78 100644
--- a/src/ppp/nm-ppp-plugin-api.h
+++ b/src/core/ppp/nm-ppp-plugin-api.h
diff --git a/src/ppp/nm-ppp-plugin.ver b/src/core/ppp/nm-ppp-plugin.ver
index fee5578753..fee5578753 100644
--- a/src/ppp/nm-ppp-plugin.ver
+++ b/src/core/ppp/nm-ppp-plugin.ver
diff --git a/src/ppp/nm-ppp-status.h b/src/core/ppp/nm-ppp-status.h
index 953bc32f11..953bc32f11 100644
--- a/src/ppp/nm-ppp-status.h
+++ b/src/core/ppp/nm-ppp-status.h
diff --git a/src/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c
index f50994a3e3..f50994a3e3 100644
--- a/src/ppp/nm-pppd-plugin.c
+++ b/src/core/ppp/nm-pppd-plugin.c
diff --git a/src/ppp/nm-pppd-plugin.h b/src/core/ppp/nm-pppd-plugin.h
index 44bb79b346..44bb79b346 100644
--- a/src/ppp/nm-pppd-plugin.h
+++ b/src/core/ppp/nm-pppd-plugin.h
diff --git a/src/settings/nm-agent-manager.c b/src/core/settings/nm-agent-manager.c
index 07a3dafe82..07a3dafe82 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/core/settings/nm-agent-manager.c
diff --git a/src/settings/nm-agent-manager.h b/src/core/settings/nm-agent-manager.h
index f4e3d1397a..f4e3d1397a 100644
--- a/src/settings/nm-agent-manager.h
+++ b/src/core/settings/nm-agent-manager.h
diff --git a/src/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c
index 81a522436e..81a522436e 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/core/settings/nm-secret-agent.c
diff --git a/src/settings/nm-secret-agent.h b/src/core/settings/nm-secret-agent.h
index 09f60bf437..09f60bf437 100644
--- a/src/settings/nm-secret-agent.h
+++ b/src/core/settings/nm-secret-agent.h
diff --git a/src/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c
index d21b120e63..d21b120e63 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/core/settings/nm-settings-connection.c
diff --git a/src/settings/nm-settings-connection.h b/src/core/settings/nm-settings-connection.h
index b1665cc5ac..b1665cc5ac 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/core/settings/nm-settings-connection.h
diff --git a/src/settings/nm-settings-plugin.c b/src/core/settings/nm-settings-plugin.c
index 79451bae6f..79451bae6f 100644
--- a/src/settings/nm-settings-plugin.c
+++ b/src/core/settings/nm-settings-plugin.c
diff --git a/src/settings/nm-settings-plugin.h b/src/core/settings/nm-settings-plugin.h
index d4e8d39683..d4e8d39683 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/core/settings/nm-settings-plugin.h
diff --git a/src/settings/nm-settings-storage.c b/src/core/settings/nm-settings-storage.c
index 7fa83e21f4..7fa83e21f4 100644
--- a/src/settings/nm-settings-storage.c
+++ b/src/core/settings/nm-settings-storage.c
diff --git a/src/settings/nm-settings-storage.h b/src/core/settings/nm-settings-storage.h
index 8f2bc3d25f..8f2bc3d25f 100644
--- a/src/settings/nm-settings-storage.h
+++ b/src/core/settings/nm-settings-storage.h
diff --git a/src/settings/nm-settings-utils.c b/src/core/settings/nm-settings-utils.c
index 8e032c4404..8e032c4404 100644
--- a/src/settings/nm-settings-utils.c
+++ b/src/core/settings/nm-settings-utils.c
diff --git a/src/settings/nm-settings-utils.h b/src/core/settings/nm-settings-utils.h
index b03c14b081..b03c14b081 100644
--- a/src/settings/nm-settings-utils.h
+++ b/src/core/settings/nm-settings-utils.h
diff --git a/src/settings/nm-settings.c b/src/core/settings/nm-settings.c
index 8b0b2c0dd3..8b0b2c0dd3 100644
--- a/src/settings/nm-settings.c
+++ b/src/core/settings/nm-settings.c
diff --git a/src/settings/nm-settings.h b/src/core/settings/nm-settings.h
index 3740f277b7..3740f277b7 100644
--- a/src/settings/nm-settings.h
+++ b/src/core/settings/nm-settings.h
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/core/settings/plugins/ifcfg-rh/meson.build
index 10b93d0a7c..10b93d0a7c 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/core/settings/plugins/ifcfg-rh/meson.build
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
index c7a1730a5e..c7a1730a5e 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
index 033fbfaa30..033fbfaa30 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifdown b/src/core/settings/plugins/ifcfg-rh/nm-ifdown
index e7bd73aec3..e7bd73aec3 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifdown
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifdown
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifup b/src/core/settings/plugins/ifcfg-rh/nm-ifup
index 96637a92fb..96637a92fb 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifup
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifup
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
index b986cc9a68..b986cc9a68 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index 5288f1bc51..5288f1bc51 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
index ff713cf3b8..ff713cf3b8 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 48c6d0fb8f..48c6d0fb8f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
index 7bbb6d806b..7bbb6d806b 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
index 28ec893fba..28ec893fba 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
index b8787def6b..b8787def6b 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index 0ebc085330..0ebc085330 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index 97111e76ea..97111e76ea 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 443732d59d..443732d59d 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
index 1c58a346f2..1c58a346f2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c
index 8f5be2ccd6..8f5be2ccd6 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/core/settings/plugins/ifcfg-rh/shvar.c
diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/core/settings/plugins/ifcfg-rh/shvar.h
index 60324be0d1..60324be0d1 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.h
+++ b/src/core/settings/plugins/ifcfg-rh/shvar.h
diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/core/settings/plugins/ifcfg-rh/tests/meson.build
index 1ce61c90a2..1ce61c90a2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/meson.build
+++ b/src/core/settings/plugins/ifcfg-rh/tests/meson.build
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
index d81d918747..d81d918747 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
index 2e69c5e7fe..2e69c5e7fe 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
index 59a6f79b42..59a6f79b42 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
index a48be78a23..a48be78a23 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
index b288c04a47..b288c04a47 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
index a8ff8df3e9..a8ff8df3e9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
index 80e969212b..80e969212b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected
index 716eedc270..716eedc270 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
index 0c2fa035cf..0c2fa035cf 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected
index 2df1fbb38b..2df1fbb38b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected
index ff55cefe7f..ff55cefe7f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
index 9c2a1ff066..9c2a1ff066 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
index ccec2b81ae..ccec2b81ae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
index ddbd986fb9..ddbd986fb9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
index 495a24d392..495a24d392 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
index aec6918a1f..aec6918a1f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
index 9d47163f65..9d47163f65 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
index 43c07ddb73..43c07ddb73 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
index 21f2e2de71..21f2e2de71 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
index d3db19b229..d3db19b229 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
index 32db726256..32db726256 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
index 214f5da55b..214f5da55b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
index cd8fc96f5a..cd8fc96f5a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
index de66dcddb8..de66dcddb8 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
index 9499278e3e..9499278e3e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
index 44eb777ce4..44eb777ce4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0
index 4f9d645c8a..4f9d645c8a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1
index 37c0df1185..37c0df1185 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2
index 0c3b6a7e91..0c3b6a7e91 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99
index 5df3f154b1..5df3f154b1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1
index f6fefc0d0c..f6fefc0d0c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1
index 21971611ef..21971611ef 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2
index 92ed461e4d..92ed461e4d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
index ce0f23ba31..ce0f23ba31 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3
index b7bdd78180..b7bdd78180 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
index 5e151875d3..5e151875d3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
index 56e233cc60..56e233cc60 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
index ecb36c3792..ecb36c3792 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
index 87493ac2b3..87493ac2b3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
index ead3a04747..ead3a04747 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
index 7bc1ae6cdd..7bc1ae6cdd 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
index b01372af29..b01372af29 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type
index 8d295c76d6..8d295c76d6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main
index 4c4834d54e..4c4834d54e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric
index 9989f58b97..9989f58b97 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
index c0de645df4..c0de645df4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
index 5bd9a3a85d..5bd9a3a85d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
index 24b5122188..24b5122188 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
index 1788efe263..1788efe263 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp
index 7135cd4259..7135cd4259 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb
index 6e6589d39e..6e6589d39e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans
index 2f46a0823c..2f46a0823c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent
index 0c5d7b8872..0c5d7b8872 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints
index 8334999b12..8334999b12 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities
index 5bdcb63ce6..5bdcb63ce6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100
index 95eb7c5b55..95eb7c5b55 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans
index fbe1cbbc53..fbe1cbbc53 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent
index 07ba6b6412..07ba6b6412 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints
index 05ae39cb6e..05ae39cb6e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options
index cea2471a9a..cea2471a9a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric
index cde1c28d67..cde1c28d67 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn
index 20c08451e2..20c08451e2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft
index d3e4edca1a..d3e4edca1a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
index abfcd6e4ce..abfcd6e4ce 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
index 99b02e42b1..99b02e42b1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
index 6c36f1defb..6c36f1defb 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
index cae51b8995..cae51b8995 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
index 63bcc840de..63bcc840de 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
index 1b10cddbe5..1b10cddbe5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
index a38f1f5f18..a38f1f5f18 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized
index 58263ece4e..58263ece4e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip
index b5028daac5..b5028daac5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
index b949171104..b949171104 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
index 5b413aa977..5b413aa977 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic
index e2cf6c212c..e2cf6c212c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore
index a2581db67c..a2581db67c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov
index 142f56e434..142f56e434 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
index c882c4796e..c882c4796e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
index 2173729d17..2173729d17 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
index a28c5c1ca4..a28c5c1ca4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc
index d0a3c25412..d0a3c25412 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
index a67ca598b7..a67ca598b7 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
index 209447b844..209447b844 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
index 26e448cc7e..26e448cc7e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
index 41c0f25c64..41c0f25c64 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1
index 80355c2643..80355c2643 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2
index 4284737a1c..4284737a1c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config
index 04df693877..04df693877 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized
index 18da66c1d7..18da66c1d7 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1
index af62dcfc18..af62dcfc18 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1
index 5ff8789129..5ff8789129 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2
index 2c01be71fc..2c01be71fc 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
index d8d9193fe4..d8d9193fe4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device
index 4ba06f28e2..4ba06f28e2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid
index 622d41ec77..622d41ec77 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev
index 446c2a627f..446c2a627f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1
index 0dc539712b..0dc539712b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2
index d98a9d364d..d98a9d364d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces
index 4a31e475ae..4a31e475ae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a
index 4328611100..4328611100 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch
index 8905ba0b32..8905ba0b32 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch
index e02e21ad26..e02e21ad26 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
index d9c95cc24a..d9c95cc24a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden
index 08b9a730a6..08b9a730a6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
index 50f4fd31e6..50f4fd31e6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
index 991ba67aa9..991ba67aa9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
index 5bb02b5cea..5bb02b5cea 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always
index 9dcb5bf851..9dcb5bf851 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default
index 3709c493c4..3709c493c4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing
index f896eb0f99..f896eb0f99 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never
index aa12d74938..aa12d74938 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
index b089103dae..b089103dae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
index 42ee200afc..42ee200afc 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
index 32d633428c..32d633428c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
index dcb46da7fa..dcb46da7fa 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
index 37bb085b50..37bb085b50 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
index 0b46acd666..0b46acd666 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
index 08496bb56d..08496bb56d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe
index 354046ad08..354046ad08 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
index 68afbe970d..68afbe970d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
index e1ce20d6de..e1ce20d6de 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
index 250efa134c..250efa134c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
index 250efa134c..250efa134c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
index 9d0bacfc76..9d0bacfc76 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
index 2bc16b6e5a..2bc16b6e5a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
index bdea6aa3b0..bdea6aa3b0 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
index cb4da43f77..cb4da43f77 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
index 250efa134c..250efa134c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls
index 9a74bb4d9b..9a74bb4d9b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
index 92aaeeab9c..92aaeeab9c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
index 42ed1d68a5..42ed1d68a5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
index 4ab45ae39b..4ab45ae39b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2
index 038b656d2d..038b656d2d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
index c3cadbb857..c3cadbb857 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
index 2119ba8e6b..2119ba8e6b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
index 2119ba8e6b..2119ba8e6b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
index 2119ba8e6b..2119ba8e6b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches
index 70d69bf52a..70d69bf52a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw
index a5434434ba..a5434434ba 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc
index fad927726c..fad927726c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
index 27bcbbf9ae..27bcbbf9ae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
index 052ab425af..052ab425af 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
index 5deee06631..5deee06631 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
index 2439747352..2439747352 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on
index d0b50775a1..d0b50775a1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip
index e683db3c7b..e683db3c7b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
index 61f8f423d4..61f8f423d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
index fe8b15b29a..fe8b15b29a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
index 3cf4323dd2..3cf4323dd2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
index 5d36675a41..5d36675a41 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
index af254f9c22..af254f9c22 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname
index cba380db3c..cba380db3c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
index de03e04480..de03e04480 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
index d38e762e20..d38e762e20 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
index 98d910531e..98d910531e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore
index bb81399e52..bb81399e52 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
index db09afdb9f..db09afdb9f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
index 6972e279d4..6972e279d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
index d906599411..d906599411 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
index 935267f72a..935267f72a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
index 45db0e4c4b..45db0e4c4b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
index 94189064f1..94189064f1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
index 95f8a8ed8d..95f8a8ed8d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
index 12d5b5e635..12d5b5e635 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n
index 2190a9959f..2190a9959f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
index 4719de2175..4719de2175 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip
index 5098aef79c..5098aef79c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
index 34acf9fe17..34acf9fe17 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
index a01f655833..a01f655833 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
index 0799903887..0799903887 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
index 688143cd2e..688143cd2e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
index 0433c62a86..0433c62a86 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
index 7faf49bdae..7faf49bdae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
index 7faf49bdae..7faf49bdae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt
index 861dd41f24..861dd41f24 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan
index 1dfc9a4331..1dfc9a4331 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
index 2af1daf3a6..2af1daf3a6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
index 7f154073d4..7f154073d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2
index 850149b21e..850149b21e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected
index 6ec53c17e9..6ec53c17e9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3
index 3d198e005b..3d198e005b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected
index d2b27eb338..d2b27eb338 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4
index f834464eb9..f834464eb9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
index 040ddc9d7d..040ddc9d7d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
index 426085765c..426085765c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
index 6936f2e063..6936f2e063 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
index fe78177e74..fe78177e74 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
index 5a9569ed60..5a9569ed60 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
index 0bd766c276..0bd766c276 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
index f5d532b283..f5d532b283 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
index b0d1470827..b0d1470827 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
index 0bd766c276..0bd766c276 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
index 6936f2e063..6936f2e063 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
index d45c0ea8e8..d45c0ea8e8 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
index 0c3bc1e1d5..0c3bc1e1d5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
index b6256b9517..b6256b9517 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
index d7813b2f58..d7813b2f58 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2
index 995721ddb8..995721ddb8 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
index d7813b2f58..d7813b2f58 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
index d0576a8ded..d0576a8ded 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
index 9a47196a22..9a47196a22 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
index 347bb85e50..347bb85e50 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw
index d29a428976..d29a428976 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
index 6936f2e063..6936f2e063 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
index 0d6a302f12..0d6a302f12 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
index 7987d1058e..7987d1058e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore
index 7987d1058e..7987d1058e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
index 4347405e3d..4347405e3d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
index c9e422e76a..c9e422e76a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
index 9c05417ec2..9c05417ec2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
index 1fef7e9792..1fef7e9792 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
index 8bdf0acf5c..8bdf0acf5c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
index dec9aa1b8f..dec9aa1b8f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
index ef1be20d2b..ef1be20d2b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
index edc2af75ca..edc2af75ca 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index ee1c0638d4..ee1c0638d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
diff --git a/src/settings/plugins/ifupdown/meson.build b/src/core/settings/plugins/ifupdown/meson.build
index 7e2b44fbb7..7e2b44fbb7 100644
--- a/src/settings/plugins/ifupdown/meson.build
+++ b/src/core/settings/plugins/ifupdown/meson.build
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index 219490b87f..219490b87f 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
index d8256a5b1a..d8256a5b1a 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 0e01d6c59f..0e01d6c59f 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h
index c5fc28742d..c5fc28742d 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index b6ba423c7a..b6ba423c7a 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h
index a3b73ea1a9..a3b73ea1a9 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h
diff --git a/src/settings/plugins/ifupdown/tests/meson.build b/src/core/settings/plugins/ifupdown/tests/meson.build
index a39e4e21e3..a39e4e21e3 100644
--- a/src/settings/plugins/ifupdown/tests/meson.build
+++ b/src/core/settings/plugins/ifupdown/tests/meson.build
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
index d2d8558e62..d2d8558e62 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
diff --git a/src/settings/plugins/ifupdown/tests/test1 b/src/core/settings/plugins/ifupdown/tests/test1
index 74c23b457d..74c23b457d 100644
--- a/src/settings/plugins/ifupdown/tests/test1
+++ b/src/core/settings/plugins/ifupdown/tests/test1
diff --git a/src/settings/plugins/ifupdown/tests/test11 b/src/core/settings/plugins/ifupdown/tests/test11
index 89561dd7df..89561dd7df 100644
--- a/src/settings/plugins/ifupdown/tests/test11
+++ b/src/core/settings/plugins/ifupdown/tests/test11
diff --git a/src/settings/plugins/ifupdown/tests/test12 b/src/core/settings/plugins/ifupdown/tests/test12
index 6096842e1e..6096842e1e 100644
--- a/src/settings/plugins/ifupdown/tests/test12
+++ b/src/core/settings/plugins/ifupdown/tests/test12
diff --git a/src/settings/plugins/ifupdown/tests/test13 b/src/core/settings/plugins/ifupdown/tests/test13
index c001f7ef1b..c001f7ef1b 100644
--- a/src/settings/plugins/ifupdown/tests/test13
+++ b/src/core/settings/plugins/ifupdown/tests/test13
diff --git a/src/settings/plugins/ifupdown/tests/test14 b/src/core/settings/plugins/ifupdown/tests/test14
index 4a153ab3b5..4a153ab3b5 100644
--- a/src/settings/plugins/ifupdown/tests/test14
+++ b/src/core/settings/plugins/ifupdown/tests/test14
diff --git a/src/settings/plugins/ifupdown/tests/test15 b/src/core/settings/plugins/ifupdown/tests/test15
index c3ceca2409..c3ceca2409 100644
--- a/src/settings/plugins/ifupdown/tests/test15
+++ b/src/core/settings/plugins/ifupdown/tests/test15
diff --git a/src/settings/plugins/ifupdown/tests/test16 b/src/core/settings/plugins/ifupdown/tests/test16
index f4f74fb5a1..f4f74fb5a1 100644
--- a/src/settings/plugins/ifupdown/tests/test16
+++ b/src/core/settings/plugins/ifupdown/tests/test16
diff --git a/src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 b/src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4
index 9e5243a7ed..9e5243a7ed 100644
--- a/src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4
+++ b/src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4
diff --git a/src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 b/src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6
index 29546a6111..29546a6111 100644
--- a/src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6
+++ b/src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6
diff --git a/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen b/src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen
index 441106da45..441106da45 100644
--- a/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen
+++ b/src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen
diff --git a/src/settings/plugins/ifupdown/tests/test2 b/src/core/settings/plugins/ifupdown/tests/test2
index 7462b35268..7462b35268 100644
--- a/src/settings/plugins/ifupdown/tests/test2
+++ b/src/core/settings/plugins/ifupdown/tests/test2
diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza
index 5cfe1730c9..5cfe1730c9 100644
--- a/src/settings/plugins/ifupdown/tests/test20-source-stanza
+++ b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza
diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
index 81922cea65..81922cea65 100644
--- a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
+++ b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
index b8a783f58b..b8a783f58b 100644
--- a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
+++ b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
diff --git a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza
index d0604ddc27..d0604ddc27 100644
--- a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza
+++ b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza
diff --git a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0 b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0
index 81922cea65..81922cea65 100644
--- a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0
+++ b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0
diff --git a/src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas b/src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas
index c13c2e7ebc..c13c2e7ebc 100644
--- a/src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas
+++ b/src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas
diff --git a/src/settings/plugins/ifupdown/tests/test3 b/src/core/settings/plugins/ifupdown/tests/test3
index f6293bbdc6..f6293bbdc6 100644
--- a/src/settings/plugins/ifupdown/tests/test3
+++ b/src/core/settings/plugins/ifupdown/tests/test3
diff --git a/src/settings/plugins/ifupdown/tests/test4 b/src/core/settings/plugins/ifupdown/tests/test4
index 46a40bc9c2..46a40bc9c2 100644
--- a/src/settings/plugins/ifupdown/tests/test4
+++ b/src/core/settings/plugins/ifupdown/tests/test4
diff --git a/src/settings/plugins/ifupdown/tests/test5 b/src/core/settings/plugins/ifupdown/tests/test5
index b69fc42bd0..b69fc42bd0 100644
--- a/src/settings/plugins/ifupdown/tests/test5
+++ b/src/core/settings/plugins/ifupdown/tests/test5
diff --git a/src/settings/plugins/ifupdown/tests/test6 b/src/core/settings/plugins/ifupdown/tests/test6
index 50ac69bd98..50ac69bd98 100644
--- a/src/settings/plugins/ifupdown/tests/test6
+++ b/src/core/settings/plugins/ifupdown/tests/test6
diff --git a/src/settings/plugins/ifupdown/tests/test7 b/src/core/settings/plugins/ifupdown/tests/test7
index 03cb131a98..03cb131a98 100644
--- a/src/settings/plugins/ifupdown/tests/test7
+++ b/src/core/settings/plugins/ifupdown/tests/test7
diff --git a/src/settings/plugins/ifupdown/tests/test8 b/src/core/settings/plugins/ifupdown/tests/test8
index 311f7e15a4..311f7e15a4 100644
--- a/src/settings/plugins/ifupdown/tests/test8
+++ b/src/core/settings/plugins/ifupdown/tests/test8
diff --git a/src/settings/plugins/ifupdown/tests/test9 b/src/core/settings/plugins/ifupdown/tests/test9
index 7d94563af9..7d94563af9 100644
--- a/src/settings/plugins/ifupdown/tests/test9
+++ b/src/core/settings/plugins/ifupdown/tests/test9
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
index 48cb8caa9b..48cb8caa9b 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.h b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.h
index b52fe9db94..b52fe9db94 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
index 669f22fdd2..669f22fdd2 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.h b/src/core/settings/plugins/keyfile/nms-keyfile-reader.h
index e7853cc6cc..e7853cc6cc 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-reader.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.c b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
index 9cd6278093..9cd6278093 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-storage.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.h b/src/core/settings/plugins/keyfile/nms-keyfile-storage.h
index 90ff6f3506..90ff6f3506 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-storage.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-storage.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
index 851e7815c9..851e7815c9 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/core/settings/plugins/keyfile/nms-keyfile-utils.h
index 4b5b4bb51f..4b5b4bb51f 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
index 5dbd5d4bec..5dbd5d4bec 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.h b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h
index 07de6569a1..07de6569a1 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
index 162bf72e58..162bf72e58 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
index 11e1ec6f63..11e1ec6f63 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
index f5463ed004..f5463ed004 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
index fc9fd8f81f..fc9fd8f81f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property
index 52b395b3ab..52b395b3ab 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property
index 3a46611d4d..3a46611d4d 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
index 3d58fee041..3d58fee041 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
index 3a984b774a..3a984b774a 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID
index 2bacb72526..2bacb72526 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2
index 20240251e1..20240251e1 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID
index 6d2bc0fad1..6d2bc0fad1 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format
index b2bf91550e..b2bf91550e 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format
index 9427b16c52..9427b16c52 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID
index 138380d080..138380d080 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags
index 330adda0f5..330adda0f5 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting
index 95d7b9a9d1..95d7b9a9d1 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name
index f27cd4a342..f27cd4a342 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names
index d9ac586496..d9ac586496 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
index 4a3b56d24f..4a3b56d24f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
index 14280eef6f..14280eef6f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
index f9ccc003df..f9ccc003df 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
index a42dd5d2a5..a42dd5d2a5 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
index 29aef49494..29aef49494 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob
index 62e6ae31fd..62e6ae31fd 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
index 4cd8668626..4cd8668626 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
index d3da598c81..d3da598c81 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing
index 2b39538ea2..2b39538ea2 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
index b1949d0dd6..b1949d0dd6 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection
index 16d4b45e15..16d4b45e15 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1
index cac135ad1d..cac135ad1d 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2
index bbf2d8d631..bbf2d8d631 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
index d3122d5395..d3122d5395 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
index eb1cdacebd..eb1cdacebd 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
index 7419e97dd2..7419e97dd2 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
index 626b6f6840..626b6f6840 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem b/src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
index ef1be20d2b..ef1be20d2b 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem b/src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
index dec9aa1b8f..dec9aa1b8f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/core/settings/plugins/keyfile/tests/meson.build
index cd1dc3aa50..cd1dc3aa50 100644
--- a/src/settings/plugins/keyfile/tests/meson.build
+++ b/src/core/settings/plugins/keyfile/tests/meson.build
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
index 27410bc5ba..27410bc5ba 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
diff --git a/src/settings/plugins/meson.build b/src/core/settings/plugins/meson.build
index cde0844be5..cde0844be5 100644
--- a/src/settings/plugins/meson.build
+++ b/src/core/settings/plugins/meson.build
diff --git a/src/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index 26e8c1cb75..26e8c1cb75 100644
--- a/src/supplicant/nm-supplicant-config.c
+++ b/src/core/supplicant/nm-supplicant-config.c
diff --git a/src/supplicant/nm-supplicant-config.h b/src/core/supplicant/nm-supplicant-config.h
index 21f1e0dc02..21f1e0dc02 100644
--- a/src/supplicant/nm-supplicant-config.h
+++ b/src/core/supplicant/nm-supplicant-config.h
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index 53e9b8dfc2..53e9b8dfc2 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/core/supplicant/nm-supplicant-interface.c
diff --git a/src/supplicant/nm-supplicant-interface.h b/src/core/supplicant/nm-supplicant-interface.h
index 97ff0a95b0..97ff0a95b0 100644
--- a/src/supplicant/nm-supplicant-interface.h
+++ b/src/core/supplicant/nm-supplicant-interface.h
diff --git a/src/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c
index b7beb3a07d..b7beb3a07d 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/core/supplicant/nm-supplicant-manager.c
diff --git a/src/supplicant/nm-supplicant-manager.h b/src/core/supplicant/nm-supplicant-manager.h
index aaeb41e60a..aaeb41e60a 100644
--- a/src/supplicant/nm-supplicant-manager.h
+++ b/src/core/supplicant/nm-supplicant-manager.h
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c
index 1b5337de9c..1b5337de9c 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/core/supplicant/nm-supplicant-settings-verify.c
diff --git a/src/supplicant/nm-supplicant-settings-verify.h b/src/core/supplicant/nm-supplicant-settings-verify.h
index 8a0c62c219..8a0c62c219 100644
--- a/src/supplicant/nm-supplicant-settings-verify.h
+++ b/src/core/supplicant/nm-supplicant-settings-verify.h
diff --git a/src/supplicant/nm-supplicant-types.h b/src/core/supplicant/nm-supplicant-types.h
index e43cb56426..e43cb56426 100644
--- a/src/supplicant/nm-supplicant-types.h
+++ b/src/core/supplicant/nm-supplicant-types.h
diff --git a/src/supplicant/tests/certs/test-ca-cert.pem b/src/core/supplicant/tests/certs/test-ca-cert.pem
index ef1be20d2b..ef1be20d2b 100644
--- a/src/supplicant/tests/certs/test-ca-cert.pem
+++ b/src/core/supplicant/tests/certs/test-ca-cert.pem
diff --git a/src/supplicant/tests/certs/test-cert.p12 b/src/core/supplicant/tests/certs/test-cert.p12
index ae4a683049..ae4a683049 100644
--- a/src/supplicant/tests/certs/test-cert.p12
+++ b/src/core/supplicant/tests/certs/test-cert.p12
diff --git a/src/supplicant/tests/meson.build b/src/core/supplicant/tests/meson.build
index 63012d106e..63012d106e 100644
--- a/src/supplicant/tests/meson.build
+++ b/src/core/supplicant/tests/meson.build
diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/core/supplicant/tests/test-supplicant-config.c
index a7873ba2c9..a7873ba2c9 100644
--- a/src/supplicant/tests/test-supplicant-config.c
+++ b/src/core/supplicant/tests/test-supplicant-config.c
diff --git a/src/systemd/meson.build b/src/core/systemd/meson.build
index 9b87d772e1..9b87d772e1 100644
--- a/src/systemd/meson.build
+++ b/src/core/systemd/meson.build
diff --git a/src/systemd/nm-sd-utils-core.c b/src/core/systemd/nm-sd-utils-core.c
index 804c7282bd..804c7282bd 100644
--- a/src/systemd/nm-sd-utils-core.c
+++ b/src/core/systemd/nm-sd-utils-core.c
diff --git a/src/systemd/nm-sd-utils-core.h b/src/core/systemd/nm-sd-utils-core.h
index 440e6349a0..440e6349a0 100644
--- a/src/systemd/nm-sd-utils-core.h
+++ b/src/core/systemd/nm-sd-utils-core.h
diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/core/systemd/nm-sd-utils-dhcp.c
index 01be2308df..01be2308df 100644
--- a/src/systemd/nm-sd-utils-dhcp.c
+++ b/src/core/systemd/nm-sd-utils-dhcp.c
diff --git a/src/systemd/nm-sd-utils-dhcp.h b/src/core/systemd/nm-sd-utils-dhcp.h
index e456012bf9..e456012bf9 100644
--- a/src/systemd/nm-sd-utils-dhcp.h
+++ b/src/core/systemd/nm-sd-utils-dhcp.h
diff --git a/src/systemd/nm-sd.c b/src/core/systemd/nm-sd.c
index 89c12337b1..89c12337b1 100644
--- a/src/systemd/nm-sd.c
+++ b/src/core/systemd/nm-sd.c
diff --git a/src/systemd/nm-sd.h b/src/core/systemd/nm-sd.h
index 7cea9b6833..7cea9b6833 100644
--- a/src/systemd/nm-sd.h
+++ b/src/core/systemd/nm-sd.h
diff --git a/src/systemd/sd-adapt-core/condition.h b/src/core/systemd/sd-adapt-core/condition.h
index d3a6812af0..d3a6812af0 100644
--- a/src/systemd/sd-adapt-core/condition.h
+++ b/src/core/systemd/sd-adapt-core/condition.h
diff --git a/src/systemd/sd-adapt-core/conf-parser.h b/src/core/systemd/sd-adapt-core/conf-parser.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/conf-parser.h
+++ b/src/core/systemd/sd-adapt-core/conf-parser.h
diff --git a/src/systemd/sd-adapt-core/device-util.h b/src/core/systemd/sd-adapt-core/device-util.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/device-util.h
+++ b/src/core/systemd/sd-adapt-core/device-util.h
diff --git a/src/systemd/sd-adapt-core/khash.h b/src/core/systemd/sd-adapt-core/khash.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/khash.h
+++ b/src/core/systemd/sd-adapt-core/khash.h
diff --git a/src/systemd/sd-adapt-core/network-util.h b/src/core/systemd/sd-adapt-core/network-util.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/network-util.h
+++ b/src/core/systemd/sd-adapt-core/network-util.h
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
index f0f85c43a9..f0f85c43a9 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c
+++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
index 0ec6ade14c..0ec6ade14c 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
+++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
diff --git a/src/systemd/sd-adapt-core/sd-daemon.h b/src/core/systemd/sd-adapt-core/sd-daemon.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/sd-daemon.h
+++ b/src/core/systemd/sd-adapt-core/sd-daemon.h
diff --git a/src/systemd/sd-adapt-core/sd-device.h b/src/core/systemd/sd-adapt-core/sd-device.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/sd-device.h
+++ b/src/core/systemd/sd-adapt-core/sd-device.h
diff --git a/src/systemd/sd-adapt-core/udev-util.h b/src/core/systemd/sd-adapt-core/udev-util.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/udev-util.h
+++ b/src/core/systemd/sd-adapt-core/udev-util.h
diff --git a/src/systemd/src/libsystemd-network/arp-util.c b/src/core/systemd/src/libsystemd-network/arp-util.c
index 327fb2ff3e..327fb2ff3e 100644
--- a/src/systemd/src/libsystemd-network/arp-util.c
+++ b/src/core/systemd/src/libsystemd-network/arp-util.c
diff --git a/src/systemd/src/libsystemd-network/arp-util.h b/src/core/systemd/src/libsystemd-network/arp-util.h
index 2dac8cfbaa..2dac8cfbaa 100644
--- a/src/systemd/src/libsystemd-network/arp-util.h
+++ b/src/core/systemd/src/libsystemd-network/arp-util.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.c b/src/core/systemd/src/libsystemd-network/dhcp-identifier.c
index 953fef19fa..953fef19fa 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-identifier.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.h b/src/core/systemd/src/libsystemd-network/dhcp-identifier.h
index e9f2ea7e95..e9f2ea7e95 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-identifier.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-internal.h b/src/core/systemd/src/libsystemd-network/dhcp-internal.h
index 40e6b1f26f..40e6b1f26f 100644
--- a/src/systemd/src/libsystemd-network/dhcp-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h
index 49392d1bea..49392d1bea 100644
--- a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-network.c b/src/core/systemd/src/libsystemd-network/dhcp-network.c
index 656482bf83..656482bf83 100644
--- a/src/systemd/src/libsystemd-network/dhcp-network.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-network.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-option.c b/src/core/systemd/src/libsystemd-network/dhcp-option.c
index 70753c68d8..70753c68d8 100644
--- a/src/systemd/src/libsystemd-network/dhcp-option.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-option.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-packet.c b/src/core/systemd/src/libsystemd-network/dhcp-packet.c
index cace916f44..cace916f44 100644
--- a/src/systemd/src/libsystemd-network/dhcp-packet.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-packet.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-protocol.h b/src/core/systemd/src/libsystemd-network/dhcp-protocol.h
index 11f4201ab2..11f4201ab2 100644
--- a/src/systemd/src/libsystemd-network/dhcp-protocol.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-protocol.h
diff --git a/src/systemd/src/libsystemd-network/dhcp6-internal.h b/src/core/systemd/src/libsystemd-network/dhcp6-internal.h
index 24d8a314a4..24d8a314a4 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h
index e9e2362d6f..e9e2362d6f 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp6-network.c b/src/core/systemd/src/libsystemd-network/dhcp6-network.c
index 4f7bd53de4..4f7bd53de4 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-network.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-network.c
diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/core/systemd/src/libsystemd-network/dhcp6-option.c
index e2bf4f7e36..e2bf4f7e36 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-option.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-option.c
diff --git a/src/systemd/src/libsystemd-network/dhcp6-protocol.h b/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h
index c700363803..c700363803 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h
diff --git a/src/systemd/src/libsystemd-network/lldp-internal.h b/src/core/systemd/src/libsystemd-network/lldp-internal.h
index f23695f974..f23695f974 100644
--- a/src/systemd/src/libsystemd-network/lldp-internal.h
+++ b/src/core/systemd/src/libsystemd-network/lldp-internal.h
diff --git a/src/systemd/src/libsystemd-network/lldp-neighbor.c b/src/core/systemd/src/libsystemd-network/lldp-neighbor.c
index 546ae1c980..546ae1c980 100644
--- a/src/systemd/src/libsystemd-network/lldp-neighbor.c
+++ b/src/core/systemd/src/libsystemd-network/lldp-neighbor.c
diff --git a/src/systemd/src/libsystemd-network/lldp-neighbor.h b/src/core/systemd/src/libsystemd-network/lldp-neighbor.h
index a5718c8c31..a5718c8c31 100644
--- a/src/systemd/src/libsystemd-network/lldp-neighbor.h
+++ b/src/core/systemd/src/libsystemd-network/lldp-neighbor.h
diff --git a/src/systemd/src/libsystemd-network/lldp-network.c b/src/core/systemd/src/libsystemd-network/lldp-network.c
index 9616cb6250..9616cb6250 100644
--- a/src/systemd/src/libsystemd-network/lldp-network.c
+++ b/src/core/systemd/src/libsystemd-network/lldp-network.c
diff --git a/src/systemd/src/libsystemd-network/lldp-network.h b/src/core/systemd/src/libsystemd-network/lldp-network.h
index bc69b324c2..bc69b324c2 100644
--- a/src/systemd/src/libsystemd-network/lldp-network.h
+++ b/src/core/systemd/src/libsystemd-network/lldp-network.h
diff --git a/src/systemd/src/libsystemd-network/network-internal.c b/src/core/systemd/src/libsystemd-network/network-internal.c
index 12b73cd50d..12b73cd50d 100644
--- a/src/systemd/src/libsystemd-network/network-internal.c
+++ b/src/core/systemd/src/libsystemd-network/network-internal.c
diff --git a/src/systemd/src/libsystemd-network/network-internal.h b/src/core/systemd/src/libsystemd-network/network-internal.h
index e5b853c0cd..e5b853c0cd 100644
--- a/src/systemd/src/libsystemd-network/network-internal.h
+++ b/src/core/systemd/src/libsystemd-network/network-internal.h
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
index 7604aafd6f..7604aafd6f 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
index 8a138ff4b6..8a138ff4b6 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
index e068e0dc91..e068e0dc91 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
index d6f0708c94..d6f0708c94 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
index 9426b65324..9426b65324 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
index 3af7d89bf0..3af7d89bf0 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/core/systemd/src/libsystemd-network/sd-lldp.c
index 8b666522cb..8b666522cb 100644
--- a/src/systemd/src/libsystemd-network/sd-lldp.c
+++ b/src/core/systemd/src/libsystemd-network/sd-lldp.c
diff --git a/src/systemd/src/libsystemd/sd-event/event-source.h b/src/core/systemd/src/libsystemd/sd-event/event-source.h
index f0d2a1b9e6..f0d2a1b9e6 100644
--- a/src/systemd/src/libsystemd/sd-event/event-source.h
+++ b/src/core/systemd/src/libsystemd/sd-event/event-source.h
diff --git a/src/systemd/src/libsystemd/sd-event/event-util.c b/src/core/systemd/src/libsystemd/sd-event/event-util.c
index 132796fc6c..132796fc6c 100644
--- a/src/systemd/src/libsystemd/sd-event/event-util.c
+++ b/src/core/systemd/src/libsystemd/sd-event/event-util.c
diff --git a/src/systemd/src/libsystemd/sd-event/event-util.h b/src/core/systemd/src/libsystemd/sd-event/event-util.h
index c8f97bc8d6..c8f97bc8d6 100644
--- a/src/systemd/src/libsystemd/sd-event/event-util.h
+++ b/src/core/systemd/src/libsystemd/sd-event/event-util.h
diff --git a/src/systemd/src/libsystemd/sd-event/sd-event.c b/src/core/systemd/src/libsystemd/sd-event/sd-event.c
index 3f1a6776fe..3f1a6776fe 100644
--- a/src/systemd/src/libsystemd/sd-event/sd-event.c
+++ b/src/core/systemd/src/libsystemd/sd-event/sd-event.c
diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.c b/src/core/systemd/src/libsystemd/sd-id128/id128-util.c
index a3f6da6381..a3f6da6381 100644
--- a/src/systemd/src/libsystemd/sd-id128/id128-util.c
+++ b/src/core/systemd/src/libsystemd/sd-id128/id128-util.c
diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.h b/src/core/systemd/src/libsystemd/sd-id128/id128-util.h
index 6b09bcd96a..6b09bcd96a 100644
--- a/src/systemd/src/libsystemd/sd-id128/id128-util.h
+++ b/src/core/systemd/src/libsystemd/sd-id128/id128-util.h
diff --git a/src/systemd/src/libsystemd/sd-id128/sd-id128.c b/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
index d5de935c77..d5de935c77 100644
--- a/src/systemd/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
diff --git a/src/systemd/src/systemd/_sd-common.h b/src/core/systemd/src/systemd/_sd-common.h
index e3de2ae562..e3de2ae562 100644
--- a/src/systemd/src/systemd/_sd-common.h
+++ b/src/core/systemd/src/systemd/_sd-common.h
diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/core/systemd/src/systemd/sd-dhcp-client.h
index c35328a9a6..c35328a9a6 100644
--- a/src/systemd/src/systemd/sd-dhcp-client.h
+++ b/src/core/systemd/src/systemd/sd-dhcp-client.h
diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/core/systemd/src/systemd/sd-dhcp-lease.h
index c255a1f912..c255a1f912 100644
--- a/src/systemd/src/systemd/sd-dhcp-lease.h
+++ b/src/core/systemd/src/systemd/sd-dhcp-lease.h
diff --git a/src/systemd/src/systemd/sd-dhcp-option.h b/src/core/systemd/src/systemd/sd-dhcp-option.h
index 71aa479b5e..71aa479b5e 100644
--- a/src/systemd/src/systemd/sd-dhcp-option.h
+++ b/src/core/systemd/src/systemd/sd-dhcp-option.h
diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/core/systemd/src/systemd/sd-dhcp6-client.h
index 75ee27d68b..75ee27d68b 100644
--- a/src/systemd/src/systemd/sd-dhcp6-client.h
+++ b/src/core/systemd/src/systemd/sd-dhcp6-client.h
diff --git a/src/systemd/src/systemd/sd-dhcp6-lease.h b/src/core/systemd/src/systemd/sd-dhcp6-lease.h
index f77b31acf9..f77b31acf9 100644
--- a/src/systemd/src/systemd/sd-dhcp6-lease.h
+++ b/src/core/systemd/src/systemd/sd-dhcp6-lease.h
diff --git a/src/systemd/src/systemd/sd-dhcp6-option.h b/src/core/systemd/src/systemd/sd-dhcp6-option.h
index ddb2c7cecd..ddb2c7cecd 100644
--- a/src/systemd/src/systemd/sd-dhcp6-option.h
+++ b/src/core/systemd/src/systemd/sd-dhcp6-option.h
diff --git a/src/systemd/src/systemd/sd-event.h b/src/core/systemd/src/systemd/sd-event.h
index 2ae2a0da48..2ae2a0da48 100644
--- a/src/systemd/src/systemd/sd-event.h
+++ b/src/core/systemd/src/systemd/sd-event.h
diff --git a/src/systemd/src/systemd/sd-id128.h b/src/core/systemd/src/systemd/sd-id128.h
index 02aa318a06..02aa318a06 100644
--- a/src/systemd/src/systemd/sd-id128.h
+++ b/src/core/systemd/src/systemd/sd-id128.h
diff --git a/src/systemd/src/systemd/sd-ipv4acd.h b/src/core/systemd/src/systemd/sd-ipv4acd.h
index 2809d8748b..2809d8748b 100644
--- a/src/systemd/src/systemd/sd-ipv4acd.h
+++ b/src/core/systemd/src/systemd/sd-ipv4acd.h
diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/core/systemd/src/systemd/sd-ipv4ll.h
index aa4d174e4b..aa4d174e4b 100644
--- a/src/systemd/src/systemd/sd-ipv4ll.h
+++ b/src/core/systemd/src/systemd/sd-ipv4ll.h
diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/core/systemd/src/systemd/sd-lldp.h
index f551f6b4fa..f551f6b4fa 100644
--- a/src/systemd/src/systemd/sd-lldp.h
+++ b/src/core/systemd/src/systemd/sd-lldp.h
diff --git a/src/systemd/src/systemd/sd-ndisc.h b/src/core/systemd/src/systemd/sd-ndisc.h
index c0e37899a7..c0e37899a7 100644
--- a/src/systemd/src/systemd/sd-ndisc.h
+++ b/src/core/systemd/src/systemd/sd-ndisc.h
diff --git a/src/tests/config/NetworkManager-warn.conf b/src/core/tests/config/NetworkManager-warn.conf
index 80df7c5232..80df7c5232 100644
--- a/src/tests/config/NetworkManager-warn.conf
+++ b/src/core/tests/config/NetworkManager-warn.conf
diff --git a/src/tests/config/NetworkManager.conf b/src/core/tests/config/NetworkManager.conf
index a447b6d68d..a447b6d68d 100644
--- a/src/tests/config/NetworkManager.conf
+++ b/src/core/tests/config/NetworkManager.conf
diff --git a/src/tests/config/NetworkManager.state b/src/core/tests/config/NetworkManager.state
index 1b9d604ac5..1b9d604ac5 100644
--- a/src/tests/config/NetworkManager.state
+++ b/src/core/tests/config/NetworkManager.state
diff --git a/src/tests/config/bad.conf b/src/core/tests/config/bad.conf
index 20d6a67a1b..20d6a67a1b 100644
--- a/src/tests/config/bad.conf
+++ b/src/core/tests/config/bad.conf
diff --git a/src/tests/config/conf.d/00-overrides.conf b/src/core/tests/config/conf.d/00-overrides.conf
index f26ed93b9a..f26ed93b9a 100644
--- a/src/tests/config/conf.d/00-overrides.conf
+++ b/src/core/tests/config/conf.d/00-overrides.conf
diff --git a/src/tests/config/conf.d/10-more.conf b/src/core/tests/config/conf.d/10-more.conf
index eadb7f96f6..eadb7f96f6 100644
--- a/src/tests/config/conf.d/10-more.conf
+++ b/src/core/tests/config/conf.d/10-more.conf
diff --git a/src/tests/config/conf.d/20-config-enable-1.conf b/src/core/tests/config/conf.d/20-config-enable-1.conf
index e6800f5236..e6800f5236 100644
--- a/src/tests/config/conf.d/20-config-enable-1.conf
+++ b/src/core/tests/config/conf.d/20-config-enable-1.conf
diff --git a/src/tests/config/conf.d/90-last.conf b/src/core/tests/config/conf.d/90-last.conf
index 7d078788de..7d078788de 100644
--- a/src/tests/config/conf.d/90-last.conf
+++ b/src/core/tests/config/conf.d/90-last.conf
diff --git a/src/tests/config/global-dns-invalid.conf b/src/core/tests/config/global-dns-invalid.conf
index e490f609cc..e490f609cc 100644
--- a/src/tests/config/global-dns-invalid.conf
+++ b/src/core/tests/config/global-dns-invalid.conf
diff --git a/src/tests/config/meson.build b/src/core/tests/config/meson.build
index cfe9c61533..cfe9c61533 100644
--- a/src/tests/config/meson.build
+++ b/src/core/tests/config/meson.build
diff --git a/src/tests/config/nm-test-device.c b/src/core/tests/config/nm-test-device.c
index e897f68e99..e897f68e99 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/core/tests/config/nm-test-device.c
diff --git a/src/tests/config/nm-test-device.h b/src/core/tests/config/nm-test-device.h
index cba17151f4..cba17151f4 100644
--- a/src/tests/config/nm-test-device.h
+++ b/src/core/tests/config/nm-test-device.h
diff --git a/src/tests/config/test-config.c b/src/core/tests/config/test-config.c
index b2f07b263c..b2f07b263c 100644
--- a/src/tests/config/test-config.c
+++ b/src/core/tests/config/test-config.c
diff --git a/src/tests/meson.build b/src/core/tests/meson.build
index 8ee8bd936e..8ee8bd936e 100644
--- a/src/tests/meson.build
+++ b/src/core/tests/meson.build
diff --git a/src/tests/test-core-with-expect.c b/src/core/tests/test-core-with-expect.c
index 35d6bf95bf..35d6bf95bf 100644
--- a/src/tests/test-core-with-expect.c
+++ b/src/core/tests/test-core-with-expect.c
diff --git a/src/tests/test-core.c b/src/core/tests/test-core.c
index b2b6612c3c..b2b6612c3c 100644
--- a/src/tests/test-core.c
+++ b/src/core/tests/test-core.c
diff --git a/src/tests/test-dcb.c b/src/core/tests/test-dcb.c
index 0df210663d..0df210663d 100644
--- a/src/tests/test-dcb.c
+++ b/src/core/tests/test-dcb.c
diff --git a/src/tests/test-ip4-config.c b/src/core/tests/test-ip4-config.c
index 5a9eae907e..5a9eae907e 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/core/tests/test-ip4-config.c
diff --git a/src/tests/test-ip6-config.c b/src/core/tests/test-ip6-config.c
index 6b995fe5c4..6b995fe5c4 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/core/tests/test-ip6-config.c
diff --git a/src/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c
index 9156328b22..9156328b22 100644
--- a/src/tests/test-l3cfg.c
+++ b/src/core/tests/test-l3cfg.c
diff --git a/src/tests/test-secret-agent.py b/src/core/tests/test-secret-agent.py
index 46f82b3485..46f82b3485 100755
--- a/src/tests/test-secret-agent.py
+++ b/src/core/tests/test-secret-agent.py
diff --git a/src/tests/test-systemd.c b/src/core/tests/test-systemd.c
index 54cca5092e..54cca5092e 100644
--- a/src/tests/test-systemd.c
+++ b/src/core/tests/test-systemd.c
diff --git a/src/tests/test-utils.c b/src/core/tests/test-utils.c
index 66368bf4be..66368bf4be 100644
--- a/src/tests/test-utils.c
+++ b/src/core/tests/test-utils.c
diff --git a/src/tests/test-wired-defname.c b/src/core/tests/test-wired-defname.c
index 6e21454972..6e21454972 100644
--- a/src/tests/test-wired-defname.c
+++ b/src/core/tests/test-wired-defname.c
diff --git a/src/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c
index 0d4b12bc12..0d4b12bc12 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/core/vpn/nm-vpn-connection.c
diff --git a/src/vpn/nm-vpn-connection.h b/src/core/vpn/nm-vpn-connection.h
index 9cf80a1ec8..9cf80a1ec8 100644
--- a/src/vpn/nm-vpn-connection.h
+++ b/src/core/vpn/nm-vpn-connection.h
diff --git a/src/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c
index 607ad7f377..607ad7f377 100644
--- a/src/vpn/nm-vpn-manager.c
+++ b/src/core/vpn/nm-vpn-manager.c
diff --git a/src/vpn/nm-vpn-manager.h b/src/core/vpn/nm-vpn-manager.h
index 5f24df25fd..5f24df25fd 100644
--- a/src/vpn/nm-vpn-manager.h
+++ b/src/core/vpn/nm-vpn-manager.h