From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Jun 2013 19:12:53 +0000 (+0200)
Subject: mount: when learning about the root mount from mountinfo, don't add conflicting dep... 
X-Git-Tag: v205~118
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=602c0e740f8290cc9c4f13f2eb4b23fbbd7a8d2b;hp=ed8086d119d8a996a0ad13d33eeb99b4d16d9492

mount: when learning about the root mount from mountinfo, don't add conflicting dep for umount.target

That way systemd won't try to umount it at shutdown.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 10073b50b..0ad3d951a 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -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 {