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
(parent:
e830abd
)
core: do not add default dependencies to /usr mount unit
author
Jon Severinsson
<jon@severinsson.net>
Mon, 21 Jul 2014 22:39:13 +0000
(
00:39
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 14 Aug 2014 16:53:32 +0000
(18:53 +0200)
This makes no difference if /usr was mounted in the initrd,
and brings the behaviour of legacy systems closer to those
with a propper initrd.
src/core/mount.c
patch
|
blob
|
history
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 102bbef91b83c1331c9d46db71f1136e27ef92e2..39a9aaf2a0bf35e0ff333c9d0116a7512db6002c 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-380,7
+380,8
@@
static int mount_add_default_dependencies(Mount *m) {
if (!p)
return 0;
- if (path_equal(m->where, "/"))
+ if (path_equal(m->where, "/") ||
+ path_equal(m->where, "/usr"))
return 0;
if (mount_is_network(p)) {