summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-08 01:17:15 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-08 01:17:15 +0200
commit07fa00f9d9f4bcedc2289680b6d39f9b0815f577 (patch)
tree25ee4cd4158866a64871118a1b2f0a2f29a98ff0 /src/nspawn
parent4df0514d299e349ce1d0649209155b9e83a23539 (diff)
nspawn: properly propagate errors when we fail to set soemthing up
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c6
1 files changed, 4 insertions, 2 deletions
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);