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:
63a8b2f
)
mount: simplify device node conditions a bit
author
Lennart Poettering
<lennart@poettering.net>
Mon, 24 Sep 2012 10:48:46 +0000
(12:48 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 24 Sep 2012 10:48:46 +0000
(12:48 +0200)
src/core/mount.c
patch
|
blob
|
history
diff --git
a/src/core/mount.c
b/src/core/mount.c
index db793f2b5d9e14c62af26f3909ff8ca8060471a3..3e40e3fc7b3729fde2fdab4847a0c56b54e08cbf 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-352,18
+352,20
@@
static int mount_add_device_links(Mount *m) {
if (!p->what)
return 0;
if (!p->what)
return 0;
- if (!mount_is_bind(p) &&
- !path_equal(m->where, "/") &&
- is_device_path(p->what)) {
- r = unit_add_node_link(UNIT(m), p->what, false);
- if (r < 0)
- return r;
- }
+ if (mount_is_bind(p))
+ return 0;
+
+ if (!is_device_path(p->what))
+ return 0;
+
+ if (path_equal(m->where, "/"))
+ return 0;
+
+ r = unit_add_node_link(UNIT(m), p->what, false);
+ if (r < 0)
+ return r;
if (p->passno > 0 &&
if (p->passno > 0 &&
- !mount_is_bind(p) &&
- !path_equal(m->where, "/") &&
- is_device_path(p->what) &&
UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
char *name;
Unit *fsck;
UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
char *name;
Unit *fsck;