From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Sep 2015 23:17:15 +0000 (+0200)
Subject: nspawn: properly propagate errors when we fail to set soemthing up
X-Git-Tag: v226~6^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07fa00f9d9f4bcedc2289680b6d39f9b0815f577;p=thirdparty%2Fsystemd.git

nspawn: properly propagate errors when we fail to set soemthing up
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ff8539397f7..8cd3cbc6207 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2727,12 +2727,14 @@ static int outer_child(
         if (r < 0)
                 return r;
 
-        if (copy_devnodes(directory) < 0)
+        r = copy_devnodes(directory);
+        if (r < 0)
                 return r;
 
         dev_setup(directory, arg_uid_shift, arg_uid_shift);
 
-        if (setup_pts(directory) < 0)
+        r = setup_pts(directory);
+        if (r < 0)
                 return r;
 
         r = setup_propagate(directory);