From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Nov 2015 22:47:38 +0000 (+0100)
Subject: machine: when we fail to extract a network interface from the machine state, don... 
X-Git-Tag: v228~108^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a37c684695befff2d2ce7e0fcce90e25e2e252c;p=thirdparty%2Fsystemd.git

machine: when we fail to extract a network interface from the machine state, don't try again

If we failed to extract a word, then that's how it is, we shouldn't try
to extract it again and again, it's unlikely to work, and we just
deadlock.

This is a fix-up for 52278ad31d92dffa9029c8a171b9e9348f5dcc8f.
---

diff --git a/src/machine/machine.c b/src/machine/machine.c
index ef5c8551b54..d88b7c90df2 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -325,11 +325,11 @@ int machine_load(Machine *m) {
                         r = extract_first_word(&p, &word, NULL, 0);
                         if (r == 0)
                                 break;
-                        else if (r == -ENOMEM)
+                        if (r == -ENOMEM)
                                 return log_oom();
-                        else if (r < 0) {
+                        if (r < 0) {
                                 log_warning_errno(r, "Failed to parse NETIF: %s", netif);
-                                continue;
+                                break;
                         }
 
                         if (safe_atoi(word, &ifi) < 0)