chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mount enumerator
[elogind.git]
/
load-fragment.c
diff --git
a/load-fragment.c
b/load-fragment.c
index 1a334bbc13a5cfe543e646f5cdcb5c031e77851b..94bdf171af56782cfae35bedade867142807942a 100644
(file)
--- a/
load-fragment.c
+++ b/
load-fragment.c
@@
-647,6
+647,8
@@
static int open_follow(char **filename, FILE **_f, Set *names, char **_id) {
if (c++ >= FOLLOW_MAX)
return -ELOOP;
if (c++ >= FOLLOW_MAX)
return -ELOOP;
+ path_kill_slashes(*filename);
+
/* Add the file name we are currently looking at to
* the names of this unit */
name = file_name_from_path(*filename);
/* Add the file name we are currently looking at to
* the names of this unit */
name = file_name_from_path(*filename);
@@
-804,12
+806,12
@@
static int load_from_path(Unit *u, const char *path) {
if ((r = unit_add_name(u, k)) < 0)
goto finish;
if ((r = unit_add_name(u, k)) < 0)
goto finish;
- if (id == k)
- assert_se(u->meta.id = set_get(u->meta.names, k));
free(k);
}
free(k);
}
+ unit_choose_id(u, id);
+
free(u->meta.load_path);
u->meta.load_path = filename;
filename = NULL;
free(u->meta.load_path);
u->meta.load_path = filename;
filename = NULL;