picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mount: simplify device node conditions a bit

This commit is contained in:
Lennart Poettering 2012-09-24 12:48:46 +02:00
parent 63a8b2f947
commit dd144c63e2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/mount.c
View File

@ -352,18 +352,20 @@ static int mount_add_device_links(Mount *m) {
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 &&
!mount_is_bind(p) &&
!path_equal(m->where, "/") &&
is_device_path(p->what) &&
UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
char *name;
Unit *fsck;