]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mount: when we fail to establish an inaccessible mount gracefully, undo the mount
authorLennart Poettering <lennart@poettering.net>
Thu, 21 Mar 2019 11:41:02 +0000 (12:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 21 Mar 2019 11:41:02 +0000 (12:41 +0100)
src/nspawn/nspawn-mount.c

index cf093cd0a2927010a2e5b3a56f7186da2a3bfd74..a3447d948a0a7c8f0a79d53301f6131cfbf70d21 100644 (file)
@@ -847,8 +847,10 @@ static int mount_inaccessible(const char *dest, CustomMount *m) {
                 return m->graceful ? 0 : r;
 
         r = mount_verbose(m->graceful ? LOG_DEBUG : LOG_ERR, NULL, where, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, NULL);
-        if (r < 0)
+        if (r < 0) {
+                umount_verbose(where);
                 return m->graceful ? 0 : r;
+        }
 
         return 0;
 }