dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

mount: load only if we there's mountinfo or fragment

Browse Source 
Having information from /proc/self/mountinfo is sufficient to consider a
mount unit loaded.

When there's no mountinfo, the loading of the fragment for the mount
unit is not optional. No extra dependency links must be added when the
loading fails.

https://bugzilla.redhat.com/show_bug.cgi?id=835848
This commit is contained in:
Michal Schmidt
2012-06-29 01:50:31 +02:00
parent 1a4ac87500
commit 8eba616fc0
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/mount.c
View File

@@ -618,7 +618,11 @@ static int mount_load(Unit *u) {
assert(u);
assert(u->load_state == UNIT_STUB);
r = unit_load_fragment_and_dropin_optional(u);
if (m->from_proc_self_mountinfo)
r = unit_load_fragment_and_dropin_optional(u);
else
r = unit_load_fragment_and_dropin(u);
if (r < 0)
return r;
@@ -1436,6 +1440,14 @@ static int mount_add_one(
} else {
delete = false;
free(e);
if (u->load_state == UNIT_ERROR) {
u->load_state = UNIT_LOADED;
u->load_error = 0;
r = mount_add_extras(MOUNT(u));
if (r < 0)
goto fail;
}
}
if (!(w = strdup(what)) ||