]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: properly propagate errors when we fail to set soemthing up
authorLennart Poettering <lennart@poettering.net>
Mon, 7 Sep 2015 23:17:15 +0000 (01:17 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 7 Sep 2015 23:17:15 +0000 (01:17 +0200)
src/nspawn/nspawn.c

index ff8539397f7d691b5336d08928c6c13751009b1c..8cd3cbc6207e8462d514883e5cdf9aac2bfe34d0 100644 (file)
@@ -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);