From 9fc1bf90fab35f7e4d613776877ee6eaa25337d8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Mar 2021 09:30:13 +0100 Subject: [PATCH] initrd: move "src/core/initrd/" to "src/nm-initrd-generator/" --- .gitignore | 13 +- Makefile.am | 568 +++++++++--------- src/core/initrd/tests/meson.build | 24 - src/core/meson.build | 1 - src/meson.build | 4 +- .../meson.build | 21 +- .../nm-initrd-generator.c | 6 +- .../nm-initrd-generator.h | 0 .../nmi-cmdline-reader.c | 3 +- .../nmi-dt-reader.c | 3 +- .../nmi-ibft-reader.c | 3 +- src/nm-initrd-generator/tests/meson.build | 43 ++ .../sysfs-bad-dns1/class/net/eth0/address | 0 .../firmware/ibft/ethernet0/gateway | 0 .../firmware/ibft/ethernet0/index | 0 .../firmware/ibft/ethernet0/ip-addr | 0 .../firmware/ibft/ethernet0/mac | 0 .../firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/prefix-len | 0 .../firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../firmware/ibft/ethernet0/subnet-mask | 0 .../firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../firmware/ibft/target0/index | 0 .../firmware/ibft/target0/ip-addr | 0 .../sysfs-bad-dns1/firmware/ibft/target0/lun | 0 .../sysfs-bad-dns1/firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../sysfs-bad-dns2/class/net/eth0/address | 0 .../firmware/ibft/ethernet0/gateway | 0 .../firmware/ibft/ethernet0/index | 0 .../firmware/ibft/ethernet0/ip-addr | 0 .../firmware/ibft/ethernet0/mac | 0 .../firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/prefix-len | 0 .../firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../firmware/ibft/ethernet0/subnet-mask | 0 .../firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../firmware/ibft/target0/index | 0 .../firmware/ibft/target0/ip-addr | 0 .../sysfs-bad-dns2/firmware/ibft/target0/lun | 0 .../sysfs-bad-dns2/firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../sysfs-bad-gateway/class/net/eth0/address | 0 .../firmware/ibft/ethernet0/gateway | 0 .../firmware/ibft/ethernet0/index | 0 .../firmware/ibft/ethernet0/ip-addr | 0 .../firmware/ibft/ethernet0/mac | 0 .../firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/prefix-len | 0 .../firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../firmware/ibft/ethernet0/subnet-mask | 0 .../firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../firmware/ibft/target0/index | 0 .../firmware/ibft/target0/ip-addr | 0 .../firmware/ibft/target0/lun | 0 .../firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../sysfs-bad-ipaddr/class/net/eth0/address | 0 .../firmware/ibft/ethernet0/gateway | 0 .../firmware/ibft/ethernet0/index | 0 .../firmware/ibft/ethernet0/ip-addr | 0 .../firmware/ibft/ethernet0/mac | 0 .../firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/prefix-len | 0 .../firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../firmware/ibft/ethernet0/subnet-mask | 0 .../firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../firmware/ibft/target0/index | 0 .../firmware/ibft/target0/ip-addr | 0 .../firmware/ibft/target0/lun | 0 .../firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../tests/sysfs-dhcp/class/net/eth0/address | 0 .../tests/sysfs-dhcp/class/net/eth1/address | 0 .../firmware/ibft/ethernet0/gateway | 0 .../sysfs-dhcp/firmware/ibft/ethernet0/index | 0 .../sysfs-dhcp/firmware/ibft/ethernet0/mac | 0 .../sysfs-dhcp/firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../sysfs-dhcp/firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/ethernet1/gateway | 0 .../sysfs-dhcp/firmware/ibft/ethernet1/index | 0 .../sysfs-dhcp/firmware/ibft/ethernet1/mac | 0 .../sysfs-dhcp/firmware/ibft/ethernet1/origin | 0 .../firmware/ibft/ethernet1/primary-dns | 0 .../firmware/ibft/ethernet1/secondary-dns | 0 .../sysfs-dhcp/firmware/ibft/ethernet1/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../sysfs-dhcp/firmware/ibft/target0/index | 0 .../sysfs-dhcp/firmware/ibft/target0/ip-addr | 0 .../sysfs-dhcp/firmware/ibft/target0/lun | 0 .../sysfs-dhcp/firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../sysfs-dhcp/firmware/ibft/target1/index | 0 .../sysfs-dhcp/firmware/ibft/target1/ip-addr | 0 .../sysfs-dhcp/firmware/ibft/target1/lun | 0 .../sysfs-dhcp/firmware/ibft/target1/port | 0 .../firmware/ibft/target1/target-name | 0 .../firmware/devicetree/base/chosen/bootpath | Bin .../devicetree/base/chosen/bootp-request | Bin .../devicetree/base/chosen/bootp-response | Bin .../firmware/devicetree/base/chosen/bootpath | Bin .../devicetree/base/chosen/broadcast-ip | 0 .../firmware/devicetree/base/chosen/client-ip | 0 .../devicetree/base/chosen/client-name | Bin .../devicetree/base/chosen/domain-name | Bin .../devicetree/base/chosen/gateway-ip | 0 .../firmware/devicetree/base/chosen/name | Bin .../devicetree/base/chosen/netmask-ip | Bin .../firmware/devicetree/base/chosen/root-path | Bin .../firmware/devicetree/base/chosen/server-ip | 0 .../firmware/devicetree/base/chosen/tftp-file | Bin .../devicetree/base/chosen/vendor-options | Bin .../devicetree/base/ethernet/device_type | Bin .../base/ethernet/local-mac-address | 0 .../devicetree/base/ethernet/mac-address | 0 .../firmware/devicetree/base/ethernet/name | Bin .../tests/sysfs-static/class/net/eth0/address | 0 .../tests/sysfs-static/class/net/eth1/address | 0 .../firmware/ibft/ethernet0/gateway | 0 .../firmware/ibft/ethernet0/index | 0 .../firmware/ibft/ethernet0/ip-addr | 0 .../sysfs-static/firmware/ibft/ethernet0/mac | 0 .../firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/prefix-len | 0 .../firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../firmware/ibft/ethernet0/subnet-mask | 0 .../sysfs-static/firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/ethernet1/gateway | 0 .../firmware/ibft/ethernet1/index | 0 .../sysfs-static/firmware/ibft/ethernet1/mac | 0 .../firmware/ibft/ethernet1/origin | 0 .../firmware/ibft/ethernet1/primary-dns | 0 .../firmware/ibft/ethernet1/secondary-dns | 0 .../sysfs-static/firmware/ibft/ethernet1/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../sysfs-static/firmware/ibft/target0/index | 0 .../firmware/ibft/target0/ip-addr | 0 .../sysfs-static/firmware/ibft/target0/lun | 0 .../sysfs-static/firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../sysfs-static/firmware/ibft/target1/index | 0 .../firmware/ibft/target1/ip-addr | 0 .../sysfs-static/firmware/ibft/target1/lun | 0 .../sysfs-static/firmware/ibft/target1/port | 0 .../firmware/ibft/target1/target-name | 0 .../tests/sysfs-vlan/class/net/eth0/address | 0 .../sysfs-vlan/firmware/ibft/ethernet0/index | 0 .../firmware/ibft/ethernet0/ip-addr | 0 .../sysfs-vlan/firmware/ibft/ethernet0/mac | 0 .../sysfs-vlan/firmware/ibft/ethernet0/origin | 0 .../firmware/ibft/ethernet0/prefix-len | 0 .../firmware/ibft/ethernet0/subnet-mask | 0 .../sysfs-vlan/firmware/ibft/ethernet0/vlan | 0 .../firmware/ibft/initiator/initiator-name | 0 .../sysfs-vlan/firmware/ibft/target0/index | 0 .../sysfs-vlan/firmware/ibft/target0/ip-addr | 0 .../sysfs-vlan/firmware/ibft/target0/lun | 0 .../sysfs-vlan/firmware/ibft/target0/port | 0 .../firmware/ibft/target0/target-name | 0 .../tests/sysfs/class/net/eth0/address | 0 .../tests/sysfs/class/net/eth2/address | 0 .../sysfs/firmware/ibft/acpi_header/oem_id | 0 .../firmware/ibft/acpi_header/oem_table_id | 0 .../sysfs/firmware/ibft/acpi_header/signature | 0 .../tests/sysfs/firmware/ibft/ethernet0/dhcp | 0 .../tests/sysfs/firmware/ibft/ethernet0/flags | 0 .../sysfs/firmware/ibft/ethernet0/gateway | 0 .../sysfs/firmware/ibft/ethernet0/hostname | 0 .../tests/sysfs/firmware/ibft/ethernet0/index | 0 .../sysfs/firmware/ibft/ethernet0/ip-addr | 0 .../tests/sysfs/firmware/ibft/ethernet0/mac | 0 .../sysfs/firmware/ibft/ethernet0/origin | 0 .../sysfs/firmware/ibft/ethernet0/prefix-len | 0 .../sysfs/firmware/ibft/ethernet0/primary-dns | 0 .../firmware/ibft/ethernet0/secondary-dns | 0 .../sysfs/firmware/ibft/ethernet0/subnet-mask | 0 .../tests/sysfs/firmware/ibft/ethernet0/vlan | 0 .../tests/sysfs/firmware/ibft/ethernet2/dhcp | 0 .../tests/sysfs/firmware/ibft/ethernet2/flags | 0 .../sysfs/firmware/ibft/ethernet2/gateway | 0 .../sysfs/firmware/ibft/ethernet2/hostname | 0 .../tests/sysfs/firmware/ibft/ethernet2/index | 0 .../sysfs/firmware/ibft/ethernet2/ip-addr | 0 .../tests/sysfs/firmware/ibft/ethernet2/mac | 0 .../sysfs/firmware/ibft/ethernet2/origin | 0 .../sysfs/firmware/ibft/ethernet2/prefix-len | 0 .../sysfs/firmware/ibft/ethernet2/primary-dns | 0 .../firmware/ibft/ethernet2/secondary-dns | 0 .../sysfs/firmware/ibft/ethernet2/subnet-mask | 0 .../tests/sysfs/firmware/ibft/ethernet2/vlan | 0 .../tests/sysfs/firmware/ibft/initiator/flags | 0 .../tests/sysfs/firmware/ibft/initiator/index | 0 .../firmware/ibft/initiator/initiator-name | 0 .../sysfs/firmware/ibft/initiator/isns-server | 0 .../firmware/ibft/initiator/pri-radius-server | 0 .../firmware/ibft/initiator/sec-radius-server | 0 .../sysfs/firmware/ibft/initiator/slp-server | 0 .../sysfs/firmware/ibft/target0/chap-type | 0 .../tests/sysfs/firmware/ibft/target0/flags | 0 .../tests/sysfs/firmware/ibft/target0/index | 0 .../tests/sysfs/firmware/ibft/target0/ip-addr | 0 .../tests/sysfs/firmware/ibft/target0/lun | 0 .../sysfs/firmware/ibft/target0/nic-assoc | 0 .../tests/sysfs/firmware/ibft/target0/port | 0 .../sysfs/firmware/ibft/target2/chap-type | 0 .../tests/sysfs/firmware/ibft/target2/flags | 0 .../tests/sysfs/firmware/ibft/target2/index | 0 .../tests/sysfs/firmware/ibft/target2/ip-addr | 0 .../tests/sysfs/firmware/ibft/target2/lun | 0 .../sysfs/firmware/ibft/target2/nic-assoc | 0 .../tests/sysfs/firmware/ibft/target2/port | 0 .../sysfs/firmware/ibft/target2/target-name | 0 .../tests/test-cmdline-reader.c | 6 +- .../tests/test-dt-reader.c | 6 +- .../tests/test-ibft-reader.c | 6 +- 226 files changed, 369 insertions(+), 338 deletions(-) delete mode 100644 src/core/initrd/tests/meson.build rename src/{core/initrd => nm-initrd-generator}/meson.build (75%) rename src/{core/initrd => nm-initrd-generator}/nm-initrd-generator.c (98%) rename src/{core/initrd => nm-initrd-generator}/nm-initrd-generator.h (100%) rename src/{core/initrd => nm-initrd-generator}/nmi-cmdline-reader.c (99%) rename src/{core/initrd => nm-initrd-generator}/nmi-dt-reader.c (99%) rename src/{core/initrd => nm-initrd-generator}/nmi-ibft-reader.c (99%) create mode 100644 src/nm-initrd-generator/tests/meson.build rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/class/net/eth1/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target1/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target1/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target1/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dhcp/firmware/ibft/target1/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-dt/firmware/devicetree/base/ethernet/name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/class/net/eth1/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/ethernet1/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target1/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target1/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target1/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target1/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-static/firmware/ibft/target1/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs-vlan/firmware/ibft/target0/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/class/net/eth0/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/class/net/eth2/address (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/acpi_header/oem_id (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/acpi_header/oem_table_id (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/acpi_header/signature (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/dhcp (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/flags (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/hostname (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet0/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/dhcp (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/flags (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/gateway (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/hostname (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/mac (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/origin (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/prefix-len (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/primary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/secondary-dns (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/subnet-mask (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/ethernet2/vlan (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/flags (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/initiator-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/isns-server (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/pri-radius-server (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/sec-radius-server (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/initiator/slp-server (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/chap-type (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/flags (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/nic-assoc (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target0/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/chap-type (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/flags (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/index (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/ip-addr (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/lun (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/nic-assoc (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/port (100%) rename src/{core/initrd => nm-initrd-generator}/tests/sysfs/firmware/ibft/target2/target-name (100%) rename src/{core/initrd => nm-initrd-generator}/tests/test-cmdline-reader.c (99%) rename src/{core/initrd => nm-initrd-generator}/tests/test-dt-reader.c (96%) rename src/{core/initrd => nm-initrd-generator}/tests/test-ibft-reader.c (98%) 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,333 +2715,327 @@ $(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) - -check_programs += src/core/initrd/tests/test-dt-reader - -src_core_initrd_tests_test_dt_reader_CPPFLAGS = \ - $(src_core_cppflags) \ + $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -src_core_initrd_tests_test_dt_reader_LDFLAGS = \ +check_programs += src/nm-initrd-generator/tests/test-dt-reader + +src_nm_initrd_generator_tests_test_dt_reader_CPPFLAGS = \ + $(src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS) + +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) \ +src_nm_initrd_generator_tests_test_ibft_reader_LDADD = \ + $(src_nm_initrd_generator_nm_initrd_generator_LDADD) + +check_programs += src/nm-initrd-generator/tests/test-cmdline-reader + +src_nm_initrd_generator_tests_test_cmdline_reader_CPPFLAGS = \ + $(src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS) + +src_nm_initrd_generator_tests_test_cmdline_reader_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) +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/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 \ + 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) -check_programs += src/core/initrd/tests/test-cmdline-reader - -src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \ - $(src_core_cppflags) \ - $(NULL) - -src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) - -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) \ - $(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) - ############################################################################### EXTRA_DIST += \ 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 similarity index 75% rename from src/core/initrd/meson.build rename to 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 similarity index 98% rename from src/core/initrd/nm-initrd-generator.c rename to 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 similarity index 100% rename from src/core/initrd/nm-initrd-generator.h rename to 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 similarity index 99% rename from src/core/initrd/nmi-cmdline-reader.c rename to 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 #include +#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 similarity index 99% rename from src/core/initrd/nmi-dt-reader.c rename to 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 #include +#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 similarity index 99% rename from src/core/initrd/nmi-ibft-reader.c rename to 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 #include +#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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/class/net/eth1/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/class/net/eth0/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/class/net/eth2/address rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/flags rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target0/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/flags rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/index rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/lun rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/port rename to 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 similarity index 100% rename from src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name rename to 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 similarity index 99% rename from src/core/initrd/tests/test-cmdline-reader.c rename to 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 similarity index 96% rename from src/core/initrd/tests/test-dt-reader.c rename to 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 similarity index 98% rename from src/core/initrd/tests/test-ibft-reader.c rename to 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" /*****************************************************************************/