diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-03 07:15:44 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-03 07:15:44 +0100 |
| commit | a31afe1a18cca840046d976a637c7918ec6f5fe2 (patch) | |
| tree | 11fd3c0d57bcae37069117036904fe3a8c7f7209 /src/machine/machine.c | |
| parent | 3342582deb95b6e364541435654eb8f6fa320f40 (diff) | |
| parent | 2c1a55cf3fe78bcf728f73487813ddd3ee020a98 (diff) | |
Merge pull request #1758 from poettering/varietygalore
A grab bag of stuff
Diffstat (limited to 'src/machine/machine.c')
| -rw-r--r-- | src/machine/machine.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index ef5c8551b5..cbc03640c1 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -325,16 +325,14 @@ 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) - continue; - if (ifi <= 0) + if (parse_ifindex(word, &ifi) < 0) continue; if (!GREEDY_REALLOC(ni, allocated, nr+1)) { |