From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 23 Jul 2016 00:28:57 +0000 (-0400)
Subject: nspawn: don't skip cleanup on locking error
X-Git-Tag: v231~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=476b8254d95488d09eebdbd175494aaafac23a3e;p=thirdparty%2Fsystemd.git

nspawn: don't skip cleanup on locking error
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index da8bee32441..b1c012a9e46 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3553,7 +3553,7 @@ int main(int argc, char *argv[]) {
                         }
                         if (r < 0) {
                                 log_error_errno(r, "Failed to lock %s: %m", arg_directory);
-                                return r;
+                                goto finish;
                         }
 
                         if (arg_template) {