From 07fa00f9d9f4bcedc2289680b6d39f9b0815f577 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Sep 2015 01:17:15 +0200
Subject: nspawn: properly propagate errors when we fail to set soemthing up

---
 src/nspawn/nspawn.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/nspawn/nspawn.c')

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ff8539397f..8cd3cbc620 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);
-- 
cgit v1.2.3-54-g00ecf