chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
c3bb87d
)
mount: also exclude /usr from unmount at shutdown
author
Lennart Poettering
<lennart@poettering.net>
Thu, 18 Jul 2013 00:31:01 +0000
(
02:31
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 18 Jul 2013 00:32:34 +0000
(
02:32
+0200)
src/core/mount.c
patch
|
blob
|
history
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 58a3f1160ff5fa3e145d8a683273e4a0afef57c1..c7d29b0c887b4b5082c689fa92dfd8e66f10164d 100644
(file)
--- 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;