226 files changed, 367 insertions, 336 deletions

diff --git a/.gitignore b/.gitignore
index 1ba40b6f5d..3d94f6cd0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,6 +162,11 @@ test-*.trs
 /src/libnmc-setting/settings-docs.h
 /src/libnmc-setting/tests/test-libnmc-setting
 
+/src/nm-initrd-generator/nm-initrd-generator
+/src/nm-initrd-generator/tests/test-cmdline-reader
+/src/nm-initrd-generator/tests/test-dt-reader
+/src/nm-initrd-generator/tests/test-ibft-reader
+
 /src/nm-online/nm-online
 
 /clients/cli/generate-docs-nm-settings-nmcli
@@ -235,10 +240,6 @@ test-*.trs
 /src/core/dhcp/tests/test-dhcp-options
 /src/core/dhcp/tests/test-dhcp-utils
 /src/core/dnsmasq/tests/test-dnsmasq-utils
-/src/core/initrd/nm-initrd-generator
-/src/core/initrd/tests/test-cmdline-reader
-/src/core/initrd/tests/test-dt-reader
-/src/core/initrd/tests/test-ibft-reader
 /src/core/nm-iface-helper
 /src/core/ndisc/tests/test-ndisc-fake
 /src/core/ndisc/tests/test-ndisc-linux
@@ -409,6 +410,10 @@ test-*.trs
 /src/NetworkManager
 /src/NetworkManager-all-sym
 /src/NetworkManager.ver
+/src/core/initrd/nm-initrd-generator
+/src/core/initrd/tests/test-cmdline-reader
+/src/core/initrd/tests/test-dt-reader
+/src/core/initrd/tests/test-ibft-reader
 /src/devices/bluetooth/tests/nm-bt-test
 /src/devices/tests/test-acd
 /src/devices/tests/test-lldp
diff --git a/Makefile.am b/Makefile.am
index aa93aec65e..698902815d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2715,332 +2715,326 @@ $(src_core_nm_iface_helper_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
 ###############################################################################
 
-noinst_LTLIBRARIES += src/core/initrd/libnmi-core.la
+noinst_LTLIBRARIES += src/nm-initrd-generator/libnmi-core.la
 
-src_core_initrd_libnmi_core_la_CPPFLAGS = \
-	$(src_core_cppflags)
-
-src_core_initrd_libnmi_core_la_SOURCES = \
-	src/core/initrd/nm-initrd-generator.h \
-	src/core/initrd/nmi-cmdline-reader.c \
-	src/core/initrd/nmi-dt-reader.c \
-	src/core/initrd/nmi-ibft-reader.c \
+src_nm_initrd_generator_libnmi_core_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/src/libnm-core-public \
+	-I$(builddir)/src/libnm-core-public \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(LIBUDEV_CFLAGS) \
+	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-libexec_PROGRAMS += src/core/initrd/nm-initrd-generator
+src_nm_initrd_generator_libnmi_core_la_SOURCES = \
+	src/nm-initrd-generator/nm-initrd-generator.h \
+	src/nm-initrd-generator/nmi-cmdline-reader.c \
+	src/nm-initrd-generator/nmi-dt-reader.c \
+	src/nm-initrd-generator/nmi-ibft-reader.c \
+	$(NULL)
 
-src_core_initrd_nm_initrd_generator_CPPFLAGS = \
-	$(src_core_cppflags)
+libexec_PROGRAMS += src/nm-initrd-generator/nm-initrd-generator
 
-src_core_initrd_nm_initrd_generator_SOURCES = \
-	src/core/initrd/nm-initrd-generator.c
+src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/src/libnm-core-public \
+	-I$(builddir)/src/libnm-core-public \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(LIBUDEV_CFLAGS) \
+	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(SANITIZER_EXEC_CFLAGS) \
+	$(NULL)
 
-src_core_initrd_nm_initrd_generator_LDADD = \
-	src/core/initrd/libnmi-core.la \
-	src/core/libNetworkManagerBase.la \
-	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
+src_nm_initrd_generator_nm_initrd_generator_LDADD = \
+	src/nm-initrd-generator/libnmi-core.la \
 	src/libnm-core-impl/libnm-core-impl.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-log-core/libnm-log-core.la \
+	src/libnm-platform/libnm-platform.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
-	src/libnm-glib-aux/libnm-glib-aux.la \
-	src/libnm-std-aux/libnm-std-aux.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-std-aux/libnm-std-aux.la \
-	src/n-dhcp4/libn-dhcp4.la \
 	src/c-siphash/libc-siphash.la \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_core_initrd_nm_initrd_generator_LDFLAGS = \
+src_nm_initrd_generator_nm_initrd_generator_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
 
-check_programs += src/core/initrd/tests/test-dt-reader
+check_programs += src/nm-initrd-generator/tests/test-dt-reader
 
-src_core_initrd_tests_test_dt_reader_CPPFLAGS = \
-	$(src_core_cppflags) \
-	$(NULL)
+src_nm_initrd_generator_tests_test_dt_reader_CPPFLAGS = \
+	$(src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS)
 
-src_core_initrd_tests_test_dt_reader_LDFLAGS = \
+src_nm_initrd_generator_tests_test_dt_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-src_core_initrd_tests_test_dt_reader_LDADD = \
-	src/core/initrd/libnmi-core.la \
-	src/core/libNetworkManagerTest.la \
-	src/libnm-glib-aux/libnm-glib-aux.la \
-	src/libnm-std-aux/libnm-std-aux.la \
-	src/c-siphash/libc-siphash.la \
-	$(GLIB_LIBS) \
-	$(NULL)
+src_nm_initrd_generator_tests_test_dt_reader_LDADD = \
+	$(src_nm_initrd_generator_nm_initrd_generator_LDADD)
 
-check_programs += src/core/initrd/tests/test-ibft-reader
+check_programs += src/nm-initrd-generator/tests/test-ibft-reader
 
-src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \
-	$(src_core_cppflags) \
-	$(NULL)
+src_nm_initrd_generator_tests_test_ibft_reader_CPPFLAGS = \
+	$(src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS)
 
-src_core_initrd_tests_test_ibft_reader_LDFLAGS = \
+src_nm_initrd_generator_tests_test_ibft_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-src_core_initrd_tests_test_ibft_reader_LDADD = \
-	src/core/initrd/libnmi-core.la \
-	src/core/libNetworkManagerTest.la \
-	src/libnm-glib-aux/libnm-glib-aux.la \
-	src/libnm-std-aux/libnm-std-aux.la \
-	src/c-siphash/libc-siphash.la \
-	$(GLIB_LIBS) \
-	$(NULL)
+src_nm_initrd_generator_tests_test_ibft_reader_LDADD = \
+	$(src_nm_initrd_generator_nm_initrd_generator_LDADD)
 
-EXTRA_DIST += \
-	src/core/initrd/meson.build \
-	src/core/initrd/tests/meson.build \
-	src/core/initrd/tests/sysfs/class/net/eth0/address \
-	src/core/initrd/tests/sysfs/class/net/eth2/address \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/index \
-	src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/flags \
-	src/core/initrd/tests/sysfs/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/index \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/lun \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/flags \
-	src/core/initrd/tests/sysfs/firmware/ibft/target2/port \
-	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
-	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \
-	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index \
-	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \
-	src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \
-	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
-	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
-	src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
-	src/core/initrd/tests/sysfs-static/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-static/class/net/eth1/address \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun \
-	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port \
-	src/core/initrd/tests/sysfs-vlan/class/net/eth0/address \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \
-	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \
-	$(NULL)
-
-check_programs += src/core/initrd/tests/test-cmdline-reader
-
-src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \
-	$(src_core_cppflags) \
-	$(NULL)
+check_programs += src/nm-initrd-generator/tests/test-cmdline-reader
 
-src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS) \
-	$(SANITIZER_EXEC_LDFLAGS)
+src_nm_initrd_generator_tests_test_cmdline_reader_CPPFLAGS = \
+	$(src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS)
 
-src_core_initrd_tests_test_cmdline_reader_LDADD = \
-	src/core/initrd/libnmi-core.la \
-	src/core/libNetworkManagerTest.la \
-	src/libnm-glib-aux/libnm-glib-aux.la \
-	src/libnm-std-aux/libnm-std-aux.la \
-	src/c-siphash/libc-siphash.la \
-	$(GLIB_LIBS) \
+src_nm_initrd_generator_tests_test_cmdline_reader_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-$(src_core_initrd_libnmi_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_initrd_nm_initrd_generator_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_initrd_tests_test_cmdline_reader_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_initrd_tests_test_ibft_reader_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_initrd_tests_test_dt_reader_OBJECTS): $(src_libnm_core_public_mkenums_h)
+src_nm_initrd_generator_tests_test_cmdline_reader_LDADD = \
+	$(src_nm_initrd_generator_nm_initrd_generator_LDADD)
+
+$(src_nm_initrd_generator_libnmi_core_la_OBJECTS):            $(src_libnm_core_public_mkenums_h)
+$(src_nm_initrd_generator_nm_initrd_generator_OBJECTS):       $(src_libnm_core_public_mkenums_h)
+$(src_nm_initrd_generator_tests_test_cmdline_reader_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nm_initrd_generator_tests_test_ibft_reader_OBJECTS):    $(src_libnm_core_public_mkenums_h)
+$(src_nm_initrd_generator_tests_test_dt_reader_OBJECTS):      $(src_libnm_core_public_mkenums_h)
+
+EXTRA_DIST += \
+	src/nm-initrd-generator/meson.build \
+	src/nm-initrd-generator/tests/meson.build \
+	src/nm-initrd-generator/tests/sysfs/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs/class/net/eth2/address \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/hostname \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/dhcp \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/flags \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/isns-server \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/slp-server \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/index \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/flags \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/nic-assoc \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/chap-type \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/flags \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/target-name \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/nic-assoc \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/ip-addr \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/chap-type \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/index \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/lun \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/flags \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/port \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/oem_id \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/signature \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/hostname \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/gateway \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/mac \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/vlan \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/dhcp \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/origin \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/index \
+	src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/flags \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs-dhcp/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-dhcp/class/net/eth1/address \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/index \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/lun \
+	src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/port \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
+	src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
+	src/nm-initrd-generator/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
+	src/nm-initrd-generator/tests/sysfs-static/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-static/class/net/eth1/address \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/port \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/mac \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/origin \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/index \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/target-name \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/index \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/lun \
+	src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/port \
+	src/nm-initrd-generator/tests/sysfs-vlan/class/net/eth0/address \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/target-name \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/index \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/lun \
+	src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/port \
+	$(NULL)
 
 ###############################################################################
 
diff --git a/src/core/initrd/tests/meson.build b/src/core/initrd/tests/meson.build
deleted file mode 100644
index e47ff7905d..0000000000
--- a/src/core/initrd/tests/meson.build
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-test_units = [
-  'test-dt-reader',
-  'test-ibft-reader',
-  'test-cmdline-reader',
-]
-
-foreach test_unit : test_units
-  exe = executable(
-    test_unit,
-    test_unit + '.c',
-    dependencies: libNetworkManagerTest_dep,
-    c_args: test_c_flags,
-    link_with: libnmi_core,
-  )
-
-  test(
-    'initrd/' + test_unit,
-    test_script,
-    timeout: default_test_timeout,
-    args: test_args + [exe.full_path()],
-  )
-endforeach
diff --git a/src/core/meson.build b/src/core/meson.build
index f3dc965762..9552f7de81 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -268,7 +268,6 @@ if enable_ppp
 endif
 
 subdir('devices')
-subdir('initrd')
 subdir('settings/plugins')
 
 # NetworkManager binary
diff --git a/src/meson.build b/src/meson.build
index 05292e9aed..3f65634616 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -90,9 +90,10 @@ subdir('libnmc-setting')
 if enable_nmtui
   subdir('libnmt-newt')
 endif
-subdir('core')
 subdir('nm-dispatcher')
 subdir('nm-online')
+subdir('nm-initrd-generator')
+subdir('core')
 subdir('contrib')
 
 if enable_tests
@@ -104,5 +105,6 @@ if enable_tests
   subdir('libnm-client-aux-extern/tests')
   subdir('libnmc-setting/tests')
   subdir('nm-dispatcher/tests')
+  subdir('nm-initrd-generator/tests')
   subdir('contrib/tests')
 endif
diff --git a/src/core/initrd/meson.build b/src/nm-initrd-generator/meson.build
index 748000e008..896ed3ec27 100644
--- a/src/core/initrd/meson.build
+++ b/src/nm-initrd-generator/meson.build
@@ -7,15 +7,26 @@ libnmi_core = static_library(
     'nmi-dt-reader.c',
     'nmi-ibft-reader.c',
   ),
-  dependencies: core_default_dep,
+  include_directories: [
+    src_inc,
+    top_inc,
+  ],
+  dependencies: [
+    libnm_core_public_dep,
+  ],
 )
 
 executable(
   'nm-initrd-generator',
   'nm-initrd-generator.c',
-  dependencies: core_default_dep,
+  include_directories: [
+    src_inc,
+    top_inc,
+  ],
+  dependencies: [
+    libnm_core_public_dep,
+  ],
   link_with: [
-    libNetworkManagerBase,
     libnmi_core,
     libnm_core_aux_intern,
     libnm_core_impl,
@@ -34,7 +45,3 @@ executable(
   install: true,
   install_dir: nm_libexecdir,
 )
-
-if enable_tests
-  subdir('tests')
-endif
diff --git a/src/core/initrd/nm-initrd-generator.c b/src/nm-initrd-generator/nm-initrd-generator.c
index 38a61051c4..337e4559d9 100644
--- a/src/core/initrd/nm-initrd-generator.c
+++ b/src/nm-initrd-generator/nm-initrd-generator.c
@@ -3,13 +3,15 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-core-impl/nm-default-libnm-core.h"
+
+#include "nm-initrd-generator.h"
 
 #include "libnm-base/nm-config-base.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 #include "libnm-glib-aux/nm-io-utils.h"
-#include "nm-initrd-generator.h"
+#include "libnm-log-core/nm-logging.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/initrd/nm-initrd-generator.h b/src/nm-initrd-generator/nm-initrd-generator.h
index 56dcfd68f3..56dcfd68f3 100644
--- a/src/core/initrd/nm-initrd-generator.h
+++ b/src/nm-initrd-generator/nm-initrd-generator.h
diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index d693836baf..c39745e518 100644
--- a/src/core/initrd/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -3,11 +3,12 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-core-impl/nm-default-libnm-core.h"
 
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
+#include "libnm-log-core/nm-logging.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-initrd-generator.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
diff --git a/src/core/initrd/nmi-dt-reader.c b/src/nm-initrd-generator/nmi-dt-reader.c
index de549a208a..99c149dcba 100644
--- a/src/core/initrd/nmi-dt-reader.c
+++ b/src/nm-initrd-generator/nmi-dt-reader.c
@@ -3,13 +3,14 @@
  * Copyright (C) 2019 Red Hat, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-core-impl/nm-default-libnm-core.h"
 
 #include "nm-initrd-generator.h"
 
 #include <arpa/inet.h>
 #include <linux/if_ether.h>
 
+#include "libnm-log-core/nm-logging.h"
 #include "libnm-core-intern/nm-core-internal.h"
 
 /*****************************************************************************/
diff --git a/src/core/initrd/nmi-ibft-reader.c b/src/nm-initrd-generator/nmi-ibft-reader.c
index 1d6e3d6e94..8f4b5a7a45 100644
--- a/src/core/initrd/nmi-ibft-reader.c
+++ b/src/nm-initrd-generator/nmi-ibft-reader.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2018 Red Hat, Inc.
  */
 
-#include "src/core/nm-default-daemon.h"
+#include "libnm-core-impl/nm-default-libnm-core.h"
 
 #include "nm-initrd-generator.h"
 
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <linux/if_ether.h>
 
+#include "libnm-log-core/nm-logging.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-platform/nm-platform-utils.h"
 
diff --git a/src/nm-initrd-generator/tests/meson.build b/src/nm-initrd-generator/tests/meson.build
new file mode 100644
index 0000000000..8fa3bcac8d
--- /dev/null
+++ b/src/nm-initrd-generator/tests/meson.build
@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+test_units = [
+  'test-dt-reader',
+  'test-ibft-reader',
+  'test-cmdline-reader',
+]
+
+foreach test_unit : test_units
+  exe = executable(
+    test_unit,
+    test_unit + '.c',
+    include_directories: [
+      src_inc,
+      top_inc,
+    ],
+    dependencies: [
+      libnm_core_public_dep,
+    ],
+    c_args: test_c_flags,
+    link_with: [
+      libnmi_core,
+      libnm_core_aux_intern,
+      libnm_core_impl,
+      libnm_crypto,
+      libnm_platform,
+      libnm_base,
+      libnm_systemd_shared,
+      libnm_udev_aux,
+      libnm_log_core,
+      libnm_glib_aux,
+      libnm_std_aux,
+      libc_siphash,
+    ],
+  )
+
+  test(
+    'nm-initrd-generator/tests/' + test_unit,
+    test_script,
+    timeout: default_test_timeout,
+    args: test_args + [exe.full_path()],
+  )
+endforeach
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-bad-dns1/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
index 2303dbdcbc..2303dbdcbc 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-bad-dns2/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
index 5ed7b71958..5ed7b71958 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-bad-gateway/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
index 1970856e09..1970856e09 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
index d526f3244f..d526f3244f 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-dhcp/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address b/src/nm-initrd-generator/tests/sysfs-dhcp/class/net/eth1/address
index befa7850fd..befa7850fd 100644
--- a/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/class/net/eth1/address
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
index e440e5c842..e440e5c842 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
index befa7850fd..befa7850fd 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
index e440e5c842..e440e5c842 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/index
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/lun
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/port
diff --git a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/target-name
index ac3a6a2ab3..ac3a6a2ab3 100644
--- a/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-dhcp/firmware/ibft/target1/target-name
diff --git a/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath b/src/nm-initrd-generator/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
index 6f069ae0fc..6f069ae0fc 100644
--- a/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
+++ b/src/nm-initrd-generator/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
index 034d423ee3..034d423ee3 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
index 25982d6f42..25982d6f42 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
index db88070270..db88070270 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
index 7bde8641b9..7bde8641b9 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
index f108ba9b39..f108ba9b39 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
index fe0f76b8ed..fe0f76b8ed 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
index b34f9f968e..b34f9f968e 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
index f036183536..f036183536 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/name
index f3e5805251..f3e5805251 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/name
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
index d441cd83fc..d441cd83fc 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
index f76dd238ad..f76dd238ad 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
index a2a4b2e8de..a2a4b2e8de 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
index c0e0e3303e..c0e0e3303e 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
index f76dd238ad..f76dd238ad 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
index df3c9d9f4c..df3c9d9f4c 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
index c983e75212..c983e75212 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
index c983e75212..c983e75212 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
diff --git a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
index 88eaddfe14..88eaddfe14 100644
--- a/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
+++ b/src/nm-initrd-generator/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
diff --git a/src/core/initrd/tests/sysfs-static/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-static/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-static/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-static/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-static/class/net/eth1/address b/src/nm-initrd-generator/tests/sysfs-static/class/net/eth1/address
index befa7850fd..befa7850fd 100644
--- a/src/core/initrd/tests/sysfs-static/class/net/eth1/address
+++ b/src/nm-initrd-generator/tests/sysfs-static/class/net/eth1/address
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/gateway
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/index
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/mac
index befa7850fd..befa7850fd 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/mac
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/origin
index e440e5c842..e440e5c842 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/origin
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/vlan
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/ethernet1/vlan
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/index
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/ip-addr
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/lun
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/port
diff --git a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/target-name
index ac3a6a2ab3..ac3a6a2ab3 100644
--- a/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-static/firmware/ibft/target1/target-name
diff --git a/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs-vlan/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
index 4923230c8c..4923230c8c 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
index cabf43b5dd..cabf43b5dd 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
index 5a279b41f0..5a279b41f0 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
index d800886d9c..d800886d9c 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
index 8e9cd2c42c..8e9cd2c42c 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
index a32ce01ba1..a32ce01ba1 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/lun
index f309ca6a0a..f309ca6a0a 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/target-name
index f0e6115796..f0e6115796 100644
--- a/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
+++ b/src/nm-initrd-generator/tests/sysfs-vlan/firmware/ibft/target0/target-name
diff --git a/src/core/initrd/tests/sysfs/class/net/eth0/address b/src/nm-initrd-generator/tests/sysfs/class/net/eth0/address
index 1f2f610ecc..1f2f610ecc 100644
--- a/src/core/initrd/tests/sysfs/class/net/eth0/address
+++ b/src/nm-initrd-generator/tests/sysfs/class/net/eth0/address
diff --git a/src/core/initrd/tests/sysfs/class/net/eth2/address b/src/nm-initrd-generator/tests/sysfs/class/net/eth2/address
index 6ec1078ab8..6ec1078ab8 100644
--- a/src/core/initrd/tests/sysfs/class/net/eth2/address
+++ b/src/nm-initrd-generator/tests/sysfs/class/net/eth2/address
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/oem_id
index 590d9cd211..590d9cd211 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/oem_id
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
index 35d4d09ce2..35d4d09ce2 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/signature
index e3a5d7ef22..e3a5d7ef22 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/acpi_header/signature
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/dhcp
index 98a0d79742..98a0d79742 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/dhcp
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/flags
index 00750edc07..00750edc07 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/flags
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/gateway
index 7f378f8f97..7f378f8f97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/gateway
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/hostname
index 3ed5163c84..3ed5163c84 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/hostname
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/index
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/index
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/ip-addr
index 98a0d79742..98a0d79742 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/ip-addr
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/mac
index f24413198a..f24413198a 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/mac
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/origin
index b8626c4cff..b8626c4cff 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/origin
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/prefix-len
index 900731ffd5..900731ffd5 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/prefix-len
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/primary-dns
index e7511d5af4..e7511d5af4 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/primary-dns
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
index 1f6c5c9547..1f6c5c9547 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
index 5df934545e..5df934545e 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/vlan
index 7cc86ad136..7cc86ad136 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet0/vlan
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/dhcp
index 61ef5585ef..61ef5585ef 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/dhcp
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/flags
index 00750edc07..00750edc07 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/flags
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/gateway
index 2096f194ff..2096f194ff 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/gateway
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/hostname
index 5dc539d584..5dc539d584 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/hostname
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/index
index 0cfbf08886..0cfbf08886 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/index
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/ip-addr
index 61ef5585ef..61ef5585ef 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/ip-addr
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/mac
index 2fc3d5253b..2fc3d5253b 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/mac
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/origin
index 00750edc07..00750edc07 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/origin
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/prefix-len
index a45fd52cc5..a45fd52cc5 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/prefix-len
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/primary-dns
index 6fa8c74292..6fa8c74292 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/primary-dns
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
index a7269ff5e9..a7269ff5e9 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
index d30f9e9fdb..d30f9e9fdb 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/vlan
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/ethernet2/vlan
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/flags
index 00750edc07..00750edc07 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/flags
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/index
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/index
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/initiator-name
index 337b5a0f3a..337b5a0f3a 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/initiator-name
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/isns-server
index 4aff93986c..4aff93986c 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/isns-server
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/pri-radius-server
index a26fb64927..a26fb64927 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/pri-radius-server
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/sec-radius-server
index 908be27f4b..908be27f4b 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/sec-radius-server
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/slp-server
index fca9e24bd5..fca9e24bd5 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/initiator/slp-server
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/chap-type
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/chap-type
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/flags
index 00750edc07..00750edc07 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/flags
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/index b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/index
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/index
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/index
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/ip-addr
index 994b6e9c69..994b6e9c69 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/ip-addr
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/lun
index 7c295bd444..7c295bd444 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/lun
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/nic-assoc
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/nic-assoc
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target0/port b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/port
index 53f0295f3f..53f0295f3f 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target0/port
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target0/port
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/chap-type
index 573541ac97..573541ac97 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/chap-type
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/flags
index 00750edc07..00750edc07 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/flags
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/index b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/index
index 0cfbf08886..0cfbf08886 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/index
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/index
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/ip-addr
index a210477e6d..a210477e6d 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/ip-addr
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/lun
index 7c295bd444..7c295bd444 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/lun
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/nic-assoc
index 0cfbf08886..0cfbf08886 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/nic-assoc
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/port b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/port
index 53f0295f3f..53f0295f3f 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/port
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/port
diff --git a/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/target-name
index f409432041..f409432041 100644
--- a/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name
+++ b/src/nm-initrd-generator/tests/sysfs/firmware/ibft/target2/target-name
diff --git a/src/core/initrd/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c
index 212bf02d3a..0bdd430b22 100644
--- a/src/core/initrd/tests/test-cmdline-reader.c
+++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c
@@ -14,11 +14,11 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 
-#include "../nm-initrd-generator.h"
+#include "nm-initrd-generator/nm-initrd-generator.h"
 
-#include "nm-test-utils-core.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
-#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/core/initrd/tests"
+#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/nm-initrd-generator/tests"
 
 /*****************************************************************************/
 
diff --git a/src/core/initrd/tests/test-dt-reader.c b/src/nm-initrd-generator/tests/test-dt-reader.c
index 5e1247ee1d..c1c28e0673 100644
--- a/src/core/initrd/tests/test-dt-reader.c
+++ b/src/nm-initrd-generator/tests/test-dt-reader.c
@@ -14,11 +14,11 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 
-#include "../nm-initrd-generator.h"
+#include "nm-initrd-generator/nm-initrd-generator.h"
 
-#include "nm-test-utils-core.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
-#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/core/initrd/tests"
+#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/nm-initrd-generator/tests"
 
 /*****************************************************************************/
 
diff --git a/src/core/initrd/tests/test-ibft-reader.c b/src/nm-initrd-generator/tests/test-ibft-reader.c
index 523747c95e..0d43751974 100644
--- a/src/core/initrd/tests/test-ibft-reader.c
+++ b/src/nm-initrd-generator/tests/test-ibft-reader.c
@@ -14,11 +14,11 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 
-#include "../nm-initrd-generator.h"
+#include "nm-initrd-generator/nm-initrd-generator.h"
 
-#include "nm-test-utils-core.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
-#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/core/initrd/tests"
+#define TEST_INITRD_DIR NM_BUILD_SRCDIR "/src/nm-initrd-generator/tests"
 
 /*****************************************************************************/