diff options
author | Daniel Mack <github@zonque.org> | 2015-11-02 12:38:24 +0100 |
---|---|---|
committer | Daniel Mack <github@zonque.org> | 2015-11-02 12:38:24 +0100 |
commit | 0fc85c8670bfe2ea4af99765e79aaf789f3ed7e9 (patch) | |
tree | 9ab389ead37e095de647d30c9695ae20446c3550 /src/machine/machine.c | |
parent | cb6762862b1151d06ed856c37b0ebab0796781e3 (diff) | |
parent | 52278ad31d92dffa9029c8a171b9e9348f5dcc8f (diff) |
Merge pull request #1751 from ssahani/word-machine
machine: fix #1739
Diffstat (limited to 'src/machine/machine.c')
-rw-r--r-- | src/machine/machine.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index df8391c996..ef5c8551b5 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -323,11 +323,14 @@ int machine_load(Machine *m) { int ifi; r = extract_first_word(&p, &word, NULL, 0); - if (r < 0) - return log_error_errno(r, "Failed to parse NETIF: %s", netif); - if (r == 0) break; + else if (r == -ENOMEM) + return log_oom(); + else if (r < 0) { + log_warning_errno(r, "Failed to parse NETIF: %s", netif); + continue; + } if (safe_atoi(word, &ifi) < 0) continue; |