summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-09-02 17:11:05 +0200
committerLubomir Rintel <lkundrak@v3.sk>2019-09-10 11:04:51 +0200
commit7a72c705acc23db85ae5fdff250fe42567029476 (patch)
tree90071d5da9bb641559da44c79af4619d25300997 /src
parenta9777d9178993ba5dc100d1ee91df5f70fee0efa (diff)
downloadNetworkManager-7a72c705acc23db85ae5fdff250fe42567029476.tar.gz
initrd: add devicetree support
This adds capability to hand over the network configuration from OpenFirmware (and potentially other boot loaders with openfirmware support such as U-Boot) to NetworkManager. It's done analogously to ACPI/iBFT. In fact, the same ip=ibft command line option is used, adding a more general ip=fw alias. This probably deserves some documentation, but I'm not adding any at this time. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/257
Diffstat (limited to 'src')
-rwxr-xr-xsrc/devices/wwan/tests/test-service-providersbin0 -> 10070856 bytes
-rw-r--r--src/initrd/meson.build1
-rw-r--r--src/initrd/nm-initrd-generator.h2
-rw-r--r--src/initrd/nmi-cmdline-reader.c10
-rw-r--r--src/initrd/nmi-dt-reader.c411
-rw-r--r--src/initrd/tests/meson.build1
-rw-r--r--src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpathbin0 -> 108 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-requestbin0 -> 273 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-responsebin0 -> 300 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpathbin0 -> 37 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip1
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip2
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-namebin0 -> 9 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-namebin0 -> 15 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip2
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/namebin0 -> 7 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ipbin0 -> 4 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-pathbin0 -> 1 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip2
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-filebin0 -> 11 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-optionsbin0 -> 1 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_typebin0 -> 8 bytes
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address1
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address1
-rw-r--r--src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/namebin0 -> 9 bytes
-rw-r--r--src/initrd/tests/test-dt-reader.c147
26 files changed, 580 insertions, 1 deletions
diff --git a/src/devices/wwan/tests/test-service-providers b/src/devices/wwan/tests/test-service-providers
new file mode 100755
index 0000000000..26c1bf2a66
--- /dev/null
+++ b/src/devices/wwan/tests/test-service-providers
Binary files differ
diff --git a/src/initrd/meson.build b/src/initrd/meson.build
index fa8c016b8d..acef8c4eac 100644
--- a/src/initrd/meson.build
+++ b/src/initrd/meson.build
@@ -1,5 +1,6 @@
sources = files(
'nmi-cmdline-reader.c',
+ 'nmi-dt-reader.c',
'nmi-ibft-reader.c',
)
diff --git a/src/initrd/nm-initrd-generator.h b/src/initrd/nm-initrd-generator.h
index dab6fb640d..579dfb34d4 100644
--- a/src/initrd/nm-initrd-generator.h
+++ b/src/initrd/nm-initrd-generator.h
@@ -41,6 +41,8 @@ GHashTable *nmi_ibft_read (const char *sysfs_dir);
gboolean nmi_ibft_update_connection_from_nic (NMConnection *connection, GHashTable *nic, GError **error);
+NMConnection *nmi_dt_reader_parse (const char *sysfs_dir);
+
GHashTable *nmi_cmdline_reader_parse (const char *sysfs_dir, char **argv);
#endif /* __NM_INITRD_GENERATOR_H__ */
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index 7a3af8d661..797b1fb9dd 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -252,7 +252,8 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
}
}
- if (ifname == NULL && g_strcmp0 (kind, "ibft") == 0) {
+ if (ifname == NULL && ( g_strcmp0 (kind, "fw") == 0
+ || g_strcmp0 (kind, "ibft") == 0)) {
GHashTableIter iter;
const char *mac;
GHashTable *nic;
@@ -284,6 +285,13 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
connection);
}
+ connection = nmi_dt_reader_parse (sysfs_dir);
+ if (connection) {
+ g_hash_table_insert (connections,
+ g_strdup ("ofw"),
+ connection);
+ }
+
return;
}
diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c
new file mode 100644
index 0000000000..c2431bf6b8
--- /dev/null
+++ b/src/initrd/nmi-dt-reader.c
@@ -0,0 +1,411 @@
+/* NetworkManager initrd configuration generator
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-initrd-generator.h"
+
+#include <arpa/inet.h>
+
+#include "nm-core-internal.h"
+
+/*****************************************************************************/
+
+#define _NMLOG(level, domain, ...) \
+ nm_log ((level), (domain), NULL, NULL, \
+ "dt-reader: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__) \
+ _NM_UTILS_MACRO_REST (__VA_ARGS__))
+
+/*****************************************************************************/
+
+static gboolean
+dt_get_property (const char *base,
+ const char *dev,
+ const char *prop,
+ char **contents,
+ size_t *length)
+{
+ gs_free char *filename = g_build_filename (base, dev, prop, NULL);
+ gs_free_error GError *error = NULL;
+
+ if (!g_file_test (filename, G_FILE_TEST_EXISTS))
+ return FALSE;
+
+ if (!contents)
+ return TRUE;
+
+ if (!g_file_get_contents (filename, contents, length, &error)) {
+ _LOGW (LOGD_CORE, "%s: Can not read the %s property: %s",
+ dev, prop, error->message);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static NMIPAddress *
+dt_get_ipaddr_property (const char *base,
+ const char *dev,
+ const char *prop,
+ int *family)
+{
+ NMIPAddress *addr;
+ gs_free char *buf = NULL;
+ size_t len;
+ gs_free_error GError *error = NULL;
+
+ if (!dt_get_property (base, dev, prop, &buf, &len))
+ return NULL;
+
+ switch (len) {
+ case 4:
+ if (*family == AF_UNSPEC)
+ *family = AF_INET;
+ break;
+ case 16:
+ if (*family == AF_UNSPEC)
+ *family = AF_INET6;
+ break;
+ default:
+ break;
+ }
+
+ if (*family == AF_UNSPEC) {
+ _LOGW (LOGD_CORE, "%s: Address %s has unrecognized length (%zd)",
+ dev, prop, len);
+ return NULL;
+ }
+
+ addr = nm_ip_address_new_binary (*family, buf, 0, &error);
+ if (!addr) {
+ _LOGW (LOGD_CORE, "%s: Address %s is malformed: %s",
+ dev, prop, error->message);
+ }
+
+ return addr;
+}
+
+static char *
+dt_get_hwaddr_property (const char *base,
+ const char *dev,
+ const char *prop)
+{
+ gs_free guint8 *buf = NULL;
+ size_t len;
+
+ if (!dt_get_property (base, dev, prop, (char **) &buf, &len))
+ return NULL;
+
+ if (len != ETH_ALEN) {
+ _LOGW (LOGD_CORE, "%s: MAC address %s has unrecognized length (%zd)",
+ dev, prop, len);
+ return NULL;
+ }
+
+ return g_strdup_printf ("%02x:%02x:%02x:%02x:%02x:%02x",
+ buf[0], buf[1], buf[2],
+ buf[3], buf[4], buf[4]);
+}
+
+static NMIPAddress *
+str_addr (const char *str, int *family)
+{
+ struct in_addr inp;
+
+ if (*family == AF_UNSPEC)
+ *family = guess_ip_address_family (str);
+
+ if (*family == AF_UNSPEC) {
+ _LOGW (LOGD_CORE, "Malformed IP address: '%s'", str);
+ return NULL;
+ }
+
+ if (*family == AF_INET && inet_aton (str, &inp)) {
+ /* For IPv4, we need to be more tolerant than
+ * nm_ip_address_new(), to recognize things like
+ * the extra zeroes in "255.255.255.000" */
+ return nm_ip_address_new_binary (*family, &inp, 0, NULL);
+ }
+
+ return nm_ip_address_new (*family, str, 0, NULL);
+}
+
+NMConnection *
+nmi_dt_reader_parse (const char *sysfs_dir)
+{
+ NMConnection *connection;
+ gs_free char *base = NULL;
+ gs_free char *bootpath = NULL;
+ gs_strfreev char **tokens = NULL;
+ char *path = NULL;
+ gboolean bootp = FALSE;
+ const char *s_ipaddr = NULL;
+ const char *s_netmask = NULL;
+ const char *s_gateway = NULL;
+ NMIPAddress *ipaddr = NULL;
+ NMIPAddress *netmask = NULL;
+ NMIPAddress *gateway = NULL;
+ const char *duplex = NULL;
+ gs_free char *hwaddr = NULL;
+ gs_free char *local_hwaddr = NULL;
+ gs_free char *hostname = NULL;
+ guint32 speed = 0;
+ int prefix = -1;
+ NMSettingIPConfig *s_ip = NULL;
+ NMSetting *s_ip4 = NULL;
+ NMSetting *s_ip6 = NULL;
+ NMSetting *s_wired = NULL;
+ int family = AF_UNSPEC;
+ int i = 0;
+ char *c;
+ gs_free_error GError *error = NULL;
+
+ base = g_build_filename (sysfs_dir, "firmware", "devicetree",
+ "base", NULL);
+
+ if (!dt_get_property (base, "chosen", "bootpath", &bootpath, NULL))
+ return NULL;
+
+ c = strchr (bootpath, ':');
+ if (c) {
+ *c = '\0';
+ path = c + 1;
+ } else {
+ path = "";
+ }
+
+ dt_get_property (base, "chosen", "client-name", &hostname, NULL);
+
+ local_hwaddr = dt_get_hwaddr_property (base, bootpath, "local-mac-address");
+ hwaddr = dt_get_hwaddr_property (base, bootpath, "mac-address");
+ if (g_strcmp0 (local_hwaddr, hwaddr) == 0)
+ g_clear_pointer (&local_hwaddr, g_free);
+
+ tokens = g_strsplit (path, ",", 0);
+
+ /*
+ * Ethernet device settings. Defined by "Open Firmware,
+ * Recommended Practice: Device Support Extensions, Version 1.0 [1]
+ * [1] https://www.devicetree.org/open-firmware/practice/devicex/dse1_0a.ps
+ */
+
+ for (i = 0; tokens[i]; i++) {
+ /* Skip these. They have magical meaning for OpenFirmware. */
+ if ( strcmp (tokens[i], "nfs") == 0
+ || strcmp (tokens[i], "last") == 0)
+ continue;
+ if (strcmp (tokens[i], "promiscuous") == 0) {
+ /* Ignore. */
+ continue;
+ }
+
+ if (g_str_has_prefix (tokens[i], "speed=")) {
+ speed = _nm_utils_ascii_str_to_int64 (tokens[i] + 6,
+ 10, 0, G_MAXUINT32, 0);
+ continue;
+ }
+
+ if (g_str_has_prefix (tokens[i], "duplex=auto")) {
+ continue;
+ } else if ( g_str_has_prefix (tokens[i], "duplex=half")
+ || g_str_has_prefix (tokens[i], "duplex=full")) {
+ duplex = tokens[i] + 7;
+ continue;
+ }
+
+ break;
+ }
+
+ /*
+ * Network boot configuration. Defined by "Open Firmware,
+ * Recommended Practice: TFTP Booting Extension, Version 1.0 [1]
+ * [1] https://www.devicetree.org/open-firmware/practice/obp-tftp/tftp1_0.pdf
+ */
+
+ for (; tokens[i]; i++) {
+ if ( strcmp (tokens[i], "bootp") == 0
+ || strcmp (tokens[i], "dhcp") == 0
+ || strcmp (tokens[i], "rarp") == 0) {
+ bootp = TRUE;
+ continue;
+ }
+ break;
+ }
+
+ /* s-iaddr, or perhaps a raw absolute filename */
+ if (tokens[i] && tokens[i][0] != '/')
+ i++;
+
+ /* filename */
+ if (tokens[i])
+ i++;
+
+ /* c-iaddr */
+ if (tokens[i]) {
+ s_ipaddr = tokens[i];
+ i++;
+ }
+
+ /* g-iaddr */
+ if (tokens[i]) {
+ s_gateway = tokens[i];
+ i++;
+ }
+
+ if (tokens[i] && ( strchr (tokens[i], '.')
+ || strchr (tokens[i], ':'))) {
+ /* yaboot claims the mask can be specified here,
+ * though it doesn't support it. */
+ s_netmask = tokens[i];
+ i++;
+ }
+
+ /* bootp-retries */
+ if (tokens[i])
+ i++;
+
+ /* tftp-retries */
+ if (tokens[i])
+ i++;
+
+ if (tokens[i]) {
+ /* yaboot accepts a mask here */
+ s_netmask = tokens[i];
+ i++;
+ }
+
+ connection = nm_simple_connection_new ();
+
+ nm_connection_add_setting (connection,
+ g_object_new (NM_TYPE_SETTING_CONNECTION,
+ NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+ NM_SETTING_CONNECTION_ID, "OpenFirmware Connection",
+ NULL));
+
+ s_ip4 = nm_setting_ip4_config_new ();
+ nm_connection_add_setting (connection, s_ip4);
+
+ s_ip6 = nm_setting_ip6_config_new ();
+ nm_connection_add_setting (connection, s_ip6);
+
+ if (!bootp && dt_get_property (base, "chosen", "bootp-response", NULL, NULL))
+ bootp = TRUE;
+
+ if (!bootp) {
+ netmask = dt_get_ipaddr_property (base, "chosen", "netmask-ip", &family);
+ gateway = dt_get_ipaddr_property (base, "chosen", "gateway-ip", &family);
+ if (gateway)
+ s_gateway = nm_ip_address_get_address (gateway);
+ ipaddr = dt_get_ipaddr_property (base, "chosen", "client-ip", &family);
+
+ if (family == AF_UNSPEC) {
+ g_warn_if_fail (netmask == NULL);
+ g_warn_if_fail (ipaddr == NULL);
+ g_warn_if_fail (gateway == NULL);
+
+ netmask = str_addr (s_netmask, &family);
+ ipaddr = str_addr (s_ipaddr, &family);
+
+ prefix = _nm_utils_ascii_str_to_int64 (s_netmask, 10, 0, 128, -1);
+ }
+
+ if (prefix == -1 && family == AF_INET && netmask) {
+ guint32 netmask_v4;
+
+ nm_ip_address_get_address_binary (netmask, &netmask_v4);
+ prefix = nm_utils_ip4_netmask_to_prefix (netmask_v4);
+ }
+
+ if (prefix == -1)
+ _LOGW (LOGD_CORE, "Unable to determine the network prefix");
+ else
+ nm_ip_address_set_prefix (ipaddr, prefix);
+
+ if (netmask)
+ nm_ip_address_unref (netmask);
+ if (gateway)
+ nm_ip_address_unref (gateway);
+ }
+
+ if (!ipaddr) {
+ family = AF_UNSPEC;
+ bootp = TRUE;
+ }
+
+ if (bootp) {
+ g_object_set (s_ip4,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+ NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname,
+ NULL);
+ g_object_set (s_ip6,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
+ NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, hostname,
+ NULL);
+ } else {
+ switch (family) {
+ case AF_INET:
+ s_ip = (NMSettingIPConfig *) s_ip4;
+ g_object_set (s_ip4,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+ NULL);
+ g_object_set (s_ip6,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_DISABLED,
+ NULL);
+ break;
+ case AF_INET6:
+ s_ip = (NMSettingIPConfig *) s_ip6;
+ g_object_set (s_ip4,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
+ NULL);
+ g_object_set (s_ip6,
+ NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
+ NULL);
+ break;
+ default:
+ g_return_val_if_reached (NULL);
+ }
+
+ nm_setting_ip_config_add_address (s_ip, ipaddr);
+ g_object_set (s_ip, NM_SETTING_IP_CONFIG_GATEWAY, s_gateway, NULL);
+ }
+
+ if (ipaddr)
+ nm_ip_address_unref (ipaddr);
+
+ if (duplex || speed || hwaddr || local_hwaddr) {
+ s_wired = nm_setting_wired_new ();
+ nm_connection_add_setting (connection, s_wired);
+
+ g_object_set (s_wired,
+ NM_SETTING_WIRED_SPEED, speed,
+ NM_SETTING_WIRED_DUPLEX, duplex,
+ NM_SETTING_WIRED_MAC_ADDRESS, hwaddr,
+ NM_SETTING_WIRED_CLONED_MAC_ADDRESS, local_hwaddr,
+ NULL);
+ }
+
+ if (!nm_connection_normalize (connection, NULL, NULL, &error)) {
+ _LOGW (LOGD_CORE, "Generated an invalid connection: %s",
+ error->message);
+ g_clear_pointer (&connection, g_object_unref);
+ }
+
+ return connection;
+}
diff --git a/src/initrd/tests/meson.build b/src/initrd/tests/meson.build
index 20cf6af23b..6a508d3d8b 100644
--- a/src/initrd/tests/meson.build
+++ b/src/initrd/tests/meson.build
@@ -1,4 +1,5 @@
test_units = [
+ 'test-dt-reader',
'test-ibft-reader',
'test-cmdline-reader',
]
diff --git a/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath b/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
new file mode 100644
index 0000000000..6f069ae0fc
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
new file mode 100644
index 0000000000..034d423ee3
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
new file mode 100644
index 0000000000..25982d6f42
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
new file mode 100644
index 0000000000..db88070270
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
new file mode 100644
index 0000000000..7bde8641b9
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
@@ -0,0 +1 @@
+ÿÿÿÿ \ No newline at end of file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
new file mode 100644
index 0000000000..f108ba9b39
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
@@ -0,0 +1,2 @@
+
++ \ No newline at end of file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
new file mode 100644
index 0000000000..fe0f76b8ed
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
new file mode 100644
index 0000000000..b34f9f968e
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
new file mode 100644
index 0000000000..f036183536
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
@@ -0,0 +1,2 @@
+
++þ \ No newline at end of file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
new file mode 100644
index 0000000000..f3e5805251
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
new file mode 100644
index 0000000000..d441cd83fc
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
new file mode 100644
index 0000000000..f76dd238ad
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
new file mode 100644
index 0000000000..a2a4b2e8de
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
@@ -0,0 +1,2 @@
+
+& \ No newline at end of file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
new file mode 100644
index 0000000000..c0e0e3303e
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
new file mode 100644
index 0000000000..f76dd238ad
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
new file mode 100644
index 0000000000..df3c9d9f4c
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
Binary files differ
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
new file mode 100644
index 0000000000..c983e75212
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
@@ -0,0 +1 @@
+¬>åØ \ No newline at end of file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
new file mode 100644
index 0000000000..c983e75212
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
@@ -0,0 +1 @@
+¬>åØ \ No newline at end of file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
new file mode 100644
index 0000000000..88eaddfe14
--- /dev/null
+++ b/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
Binary files differ
diff --git a/src/initrd/tests/test-dt-reader.c b/src/initrd/tests/test-dt-reader.c
new file mode 100644
index 0000000000..20f455476e
--- /dev/null
+++ b/src/initrd/tests/test-dt-reader.c
@@ -0,0 +1,147 @@
+/* NetworkManager initrd configuration generator
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2014 - 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <netinet/ether.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+
+#include "nm-core-internal.h"
+#include "NetworkManagerUtils.h"
+
+#include "../nm-initrd-generator.h"
+
+#include "nm-test-utils-core.h"
+
+static void
+test_read_dt_ofw (void)
+{
+ NMConnection *connection;
+ NMSettingConnection *s_con;
+ NMSettingWired *s_wired;
+ NMSettingIPConfig *s_ip4;
+ NMSettingIPConfig *s_ip6;
+ const char *mac_address;
+
+ connection = nmi_dt_reader_parse (TEST_INITRD_DIR "/sysfs-dt");
+ g_assert (connection);
+ nmtst_assert_connection_verifies (connection);
+
+ s_con = nm_connection_get_setting_connection (connection);
+ g_assert (s_con);
+ g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
+ g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "OpenFirmware Connection");
+ g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);
+ g_assert (nm_setting_connection_get_autoconnect (s_con));
+
+ s_wired = nm_connection_get_setting_wired (connection);
+ g_assert (s_wired);
+ mac_address = nm_setting_wired_get_mac_address (s_wired);
+ g_assert (mac_address);
+ g_assert (nm_utils_hwaddr_matches (mac_address, -1, "ac:7f:3e:e5:d8:d8", -1));
+ g_assert (!nm_setting_wired_get_duplex (s_wired));
+ g_assert_cmpint (nm_setting_wired_get_speed (s_wired), ==, 0);
+ g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 0);
+
+ s_ip4 = nm_connection_get_setting_ip4_config (connection);
+ g_assert (s_ip4);
+ g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+ g_assert_cmpstr (nm_setting_ip_config_get_dhcp_hostname (s_ip4), ==, "demiurge");
+
+ s_ip6 = nm_connection_get_setting_ip6_config (connection);
+ g_assert (s_ip6);
+ g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+
+ g_object_unref (connection);
+}
+
+static void
+test_read_dt_slof (void)
+{
+ NMConnection *connection;
+ NMSettingConnection *s_con;
+ NMSettingWired *s_wired;
+ NMSettingIPConfig *s_ip4;
+ NMSettingIPConfig *s_ip6;
+ NMIPAddress *ip4_addr;
+
+ connection = nmi_dt_reader_parse (TEST_INITRD_DIR "/sysfs-dt-tftp");
+ g_assert (connection);
+ nmtst_assert_connection_verifies (connection);
+
+ s_con = nm_connection_get_setting_connection (connection);
+ g_assert (s_con);
+ g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
+ g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "OpenFirmware Connection");
+ g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);
+ g_assert (nm_setting_connection_get_autoconnect (s_con));
+
+ s_wired = nm_connection_get_setting_wired (connection);
+ g_assert (s_wired);
+ g_assert (!nm_setting_wired_get_mac_address (s_wired));
+ g_assert_cmpstr (nm_setting_wired_get_duplex (s_wired), ==, "half");
+ g_assert_cmpint (nm_setting_wired_get_speed (s_wired), ==, 10);
+ g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 0);
+
+ s_ip4 = nm_connection_get_setting_ip4_config (connection);
+ g_assert (s_ip4);
+ g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
+
+ g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
+ ip4_addr = nm_setting_ip_config_get_address (s_ip4, 0);
+ g_assert (ip4_addr);
+ g_assert_cmpstr (nm_ip_address_get_address (ip4_addr), ==, "192.168.32.2");
+ g_assert_cmpint (nm_ip_address_get_prefix (ip4_addr), ==, 16);
+
+ g_assert_cmpstr (nm_setting_ip_config_get_gateway (s_ip4), ==, "192.168.32.1");
+
+ s_ip6 = nm_connection_get_setting_ip6_config (connection);
+ g_assert (s_ip6);
+ g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_DISABLED);
+
+ g_object_unref (connection);
+}
+
+static void
+test_read_dt_none (void)
+{
+ NMConnection *connection;
+
+ connection = nmi_dt_reader_parse (TEST_INITRD_DIR "/sysfs");
+ g_assert (!connection);
+}
+
+NMTST_DEFINE ();
+
+int main (int argc, char **argv)
+{
+ nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
+
+ g_test_add_func ("/initrd/dt/ofw", test_read_dt_ofw);
+ g_test_add_func ("/initrd/dt/slof", test_read_dt_slof);
+ g_test_add_func ("/initrd/dt/none", test_read_dt_none);
+
+ return g_test_run ();
+}