diff options
author | Daniel Mack <github@zonque.org> | 2015-09-30 15:55:26 +0200 |
---|---|---|
committer | Daniel Mack <github@zonque.org> | 2015-09-30 15:55:26 +0200 |
commit | 1115d417067190d5144586e0147b5ca7a917227c (patch) | |
tree | fb101d9c4a7c3b041db537a9aacba40fd469132a /src/basic | |
parent | 6b68a4442e2b9343d10476810c6662b496dd250d (diff) | |
parent | 2ca2a91cf1deba83825692f1ce06116d2aed2379 (diff) |
Merge pull request #1417 from poettering/nspawn-and-more
Various fixes, primarily for nspawn, but other stuff too
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/log.c b/src/basic/log.c index 38f42b3a6e..e6d7d15182 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -922,7 +922,7 @@ int log_set_max_level_from_string(const char *e) { t = log_level_from_string(e); if (t < 0) - return t; + return -EINVAL; log_set_max_level(t); return 0; |