summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-22 02:34:45 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-22 02:34:45 +0200
commit8e112c803cb9b1ab1d564d0e5a7f06af59a2a30a (patch)
tree477ede07cd90c7470d8ff434c654c1cb668b691e /src
parenta45ad24e05ec6695c7e3dab1590a7163e39eca88 (diff)
parent7ff307bc4cc81440e9ac4a2ca09c6100d76ca89a (diff)
Merge pull request #1323 from dvdhrm/mount-propagate
mount: propagate error codes correctly
Diffstat (limited to 'src')
-rw-r--r--src/core/mount-setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 65f3d06ad0..9b16eaa0e2 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -208,7 +208,7 @@ int mount_setup_early(void) {
int j;
j = mount_one(mount_table + i, false);
- if (r == 0)
+ if (j != 0 && r >= 0)
r = j;
}
@@ -351,7 +351,7 @@ int mount_setup(bool loaded_policy) {
int j;
j = mount_one(mount_table + i, loaded_policy);
- if (r == 0)
+ if (j != 0 && r >= 0)
r = j;
}