folkslinux
/
eudev
mirror of https://github.com/eudev-project/eudev.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dropin: don't fail if random files are stored in .wants directories 

https://bugs.freedesktop.org/show_bug.cgi?id=39957
This commit is contained in:
Lennart Poettering 2011-08-31 03:55:38 +02:00
parent d76702a7b2
commit f917c3e5e1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/load-dropin.c
View File

@ -36,7 +36,8 @@ static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
assert(u);
assert(path);
if (!(d = opendir(path))) {
d = opendir(path);
if (!d) {
if (errno == ENOENT)
return 0;
@ -60,7 +61,7 @@ static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
free(f);
if (r < 0)
goto finish;
log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->meta.id, strerror(-r));
}
r = 0;
@ -97,7 +98,8 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
char *template;
/* Also try the template dir */
if (!(template = unit_name_template(name)))
template = unit_name_template(name);
if (!template)
return -ENOMEM;
path = join(unit_path, "/", template, suffix, NULL);
@ -134,10 +136,12 @@ int unit_load_dropin(Unit *u) {
STRV_FOREACH(p, u->meta.manager->lookup_paths.unit_path) {
int r;
if ((r = process_dir(u, *p, t, ".wants", UNIT_WANTS)) < 0)
r = process_dir(u, *p, t, ".wants", UNIT_WANTS);
if (r < 0)
return r;
if ((r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES)) < 0)
r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES);
if (r < 0)
return r;
}
}