summaryrefslogtreecommitdiff
path: root/src/umount.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-03-06 01:28:32 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-06 01:28:32 +0100
commit9cacf564513b5fd6078cd418b104083aab8b9bd8 (patch)
tree203ce4b048411284683f22a2ed8a29a903cdf89e /src/umount.c
parent7d900eb6f58ca76a0f742c6e1823aa7317d4471f (diff)
umount: don't try to umount /usr, if we are running from it
Diffstat (limited to 'src/umount.c')
-rw-r--r--src/umount.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/umount.c b/src/umount.c
index 4e036d82a3..0a63d23a01 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -410,7 +410,11 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
assert(head);
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
- if (streq(m->path, "/")) {
+ if (path_equal(m->path, "/")
+#ifndef HAVE_SPLIT_USR
+ || path_equal(m->path, "/usr")
+#endif
+ ) {
n_failed++;
continue;
}