From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Jul 2013 00:31:01 +0000 (+0200)
Subject: mount: also exclude /usr from unmount at shutdown
X-Git-Tag: v206~55
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=20422497109aaba1d214f1597530de8b8788a526;p=elogind.git

mount: also exclude /usr from unmount at shutdown
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 58a3f1160..c7d29b0c8 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1543,7 +1543,8 @@ static int mount_add_one(
                 if (r < 0)
                         goto fail;
 
-                if (!path_equal(where, "/")) {
+                if (!path_equal(where, "/") &&
+                    !path_equal(where, "/usr")) {
                         r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
                         if (r < 0)
                                 goto fail;