diff options
Diffstat (limited to 'load-fragment.c')
| -rw-r--r-- | load-fragment.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/load-fragment.c b/load-fragment.c index 1a334bbc13..94bdf171af 100644 --- 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; + 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); @@ -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 (id == k) - assert_se(u->meta.id = set_get(u->meta.names, k)); free(k); } + unit_choose_id(u, id); + free(u->meta.load_path); u->meta.load_path = filename; filename = NULL; |