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:
ed8086d
)
mount: when learning about the root mount from mountinfo, don't add conflicting dep...
author
Lennart Poettering
<lennart@poettering.net>
Mon, 17 Jun 2013 19:12:53 +0000
(21:12 +0200)
committer
Lennart 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
patch
|
blob
|
history
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 10073b50be0b720cca06d9339a13b14b897bd75e..0ad3d951a5388e17a7ffcd2d14323c2eefb5939d 100644
(file)
--- 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 {