chiark / gitweb /
mount: when learning about the root mount from mountinfo, don't add conflicting dep...
authorLennart Poettering <lennart@poettering.net>
Mon, 17 Jun 2013 19:12:53 +0000 (21:12 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 17 Jun 2013 19:12:53 +0000 (21:12 +0200)
That way systemd won't try to umount it at shutdown.

src/core/mount.c

index 10073b5..0ad3d95 100644 (file)
@@ -1538,9 +1538,11 @@ static int mount_add_one(
                 if (r < 0)
                         goto fail;
 
-                r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
-                if (r < 0)
-                        goto fail;
+                if (!path_equal(where, "/")) {
+                        r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
+                        if (r < 0)
+                                goto fail;
+                }
 
                 unit_add_to_load_queue(u);
         } else {