From 6a37c684695befff2d2ce7e0fcce90e25e2e252c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 2 Nov 2015 23:47:38 +0100 Subject: 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. --- src/machine/machine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/machine/machine.c b/src/machine/machine.c index ef5c8551b5..d88b7c90df 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) -- cgit v1.2.3-54-g00ecf