diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 12:20:27 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 12:20:27 +0200 |
| commit | 486e0bef719d78ee55d2166b0bfb4fa684c09854 (patch) | |
| tree | aead4c1cc30eb61a2d9dec70f7c8339904506fad /src/initrd/nmi-ibft-reader.c | |
| parent | 39143df7aed46e83f8c68ea9ad6d24cfdf5a1dd8 (diff) | |
| parent | 10ae7d8cd706062742d0cdb1803d49909aef9e06 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src/initrd/nmi-ibft-reader.c')
| -rw-r--r-- | src/initrd/nmi-ibft-reader.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c index 477bc0bf..fe6f6432 100644 --- a/src/initrd/nmi-ibft-reader.c +++ b/src/initrd/nmi-ibft-reader.c @@ -17,7 +17,6 @@ #include <unistd.h> #include "nm-core-internal.h" -#include "platform/nm-platform.h" #include "NetworkManagerUtils.h" /*****************************************************************************/ @@ -185,12 +184,12 @@ ip_setting_add_from_block (GHashTable *nic, return FALSE; } - if ( (g_strcmp0 (s_origin, "3") == 0 && family == AF_INET) - || (g_strcmp0 (s_origin, "4") == 0 && family == AF_INET)) { + if ( (nm_streq0 (s_origin, "3") && family == AF_INET) + || (nm_streq0 (s_origin, "4") && family == AF_INET)) { method = NM_SETTING_IP4_CONFIG_METHOD_AUTO; - } else if (g_strcmp0 (s_origin, "3") == 0 && family == AF_INET6) { + } else if (nm_streq0 (s_origin, "3") && family == AF_INET6) { method = NM_SETTING_IP6_CONFIG_METHOD_DHCP; - } else if (g_strcmp0 (s_origin, "4") == 0 && family == AF_INET6) { + } else if (nm_streq0 (s_origin, "4") && family == AF_INET6) { method = NM_SETTING_IP6_CONFIG_METHOD_AUTO; } else if (family == AF_INET) { method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL; |