X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=5bb33859832e4518a07027a12cd4d06915c07ed9;hp=7e0e20c603aef5c1e8c6e37c6a8b950340cd64ae;hb=32802361561403cb6441198c82d9c499e0513863;hpb=d309c1c36426f9a355e28e3c35153281939aeea6 diff --git a/src/shared/install.c b/src/shared/install.c index 7e0e20c60..5bb338598 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -41,11 +41,22 @@ #include "special.h" typedef struct { - Hashmap *will_install; - Hashmap *have_installed; + OrderedHashmap *will_install; + OrderedHashmap *have_installed; } InstallContext; -#define _cleanup_install_context_done_ _cleanup_(install_context_done) +static int in_search_path(const char *path, char **search) { + _cleanup_free_ char *parent = NULL; + int r; + + assert(path); + + r = path_get_parent(path, &parent); + if (r < 0) + return r; + + return strv_contains(search, parent); +} static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope, @@ -75,15 +86,10 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d case UNIT_FILE_SYSTEM: - if (root_dir && runtime) - asprintf(&p, "%s/run/systemd/system", root_dir); - else if (runtime) - p = strdup("/run/systemd/system"); - else if (root_dir) - asprintf(&p, "%s/%s", root_dir, SYSTEM_CONFIG_UNIT_PATH); + if (runtime) + p = path_join(root_dir, "/run/systemd/system", NULL); else - p = strdup(SYSTEM_CONFIG_UNIT_PATH); - + p = path_join(root_dir, SYSTEM_CONFIG_UNIT_PATH, NULL); break; case UNIT_FILE_GLOBAL: @@ -99,10 +105,14 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d case UNIT_FILE_USER: - if (root_dir || runtime) + if (root_dir) return -EINVAL; - r = user_config_home(&p); + if (runtime) + r = user_runtime_dir(&p); + else + r = user_config_home(&p); + if (r <= 0) return r < 0 ? r : -ENOENT; @@ -147,12 +157,16 @@ static int add_file_change( if (!c[i].path) return -ENOMEM; + path_kill_slashes(c[i].path); + if (source) { c[i].source = strdup(source); if (!c[i].source) { free(c[i].path); return -ENOMEM; } + + path_kill_slashes(c[i].path); } else c[i].source = NULL; @@ -169,7 +183,7 @@ static int mark_symlink_for_removal( assert(p); - r = set_ensure_allocated(remove_symlinks_to, string_hash_func, string_compare_func); + r = set_ensure_allocated(remove_symlinks_to, &string_hash_ops); if (r < 0) return r; @@ -266,8 +280,22 @@ static int remove_marked_symlinks_fd( if (unit_name_is_instance(de->d_name) && instance_whitelist && - !strv_contains(instance_whitelist, de->d_name)) - continue; + !strv_contains(instance_whitelist, de->d_name)) { + + _cleanup_free_ char *w; + + /* OK, the file is not listed directly + * in the whitelist, so let's check if + * the template of it might be + * listed. */ + + w = unit_name_template(de->d_name); + if (!w) + return -ENOMEM; + + if (!strv_contains(instance_whitelist, w)) + continue; + } p = path_make_absolute(de->d_name, path); if (!p) @@ -287,30 +315,27 @@ static int remove_marked_symlinks_fd( set_get(remove_symlinks_to, dest) || set_get(remove_symlinks_to, basename(dest)); - if (found) { - - if (unlink(p) < 0 && errno != ENOENT) { - - if (r == 0) - r = -errno; - continue; - } - - rmdir_parents(p, config_path); + if (!found) + continue; - path_kill_slashes(p); + if (unlink(p) < 0 && errno != ENOENT) { + if (r == 0) + r = -errno; + continue; + } - add_file_change(changes, n_changes, UNIT_FILE_UNLINK, p, NULL); + path_kill_slashes(p); + rmdir_parents(p, config_path); + add_file_change(changes, n_changes, UNIT_FILE_UNLINK, p, NULL); - if (!set_get(remove_symlinks_to, p)) { + if (!set_get(remove_symlinks_to, p)) { - q = mark_symlink_for_removal(&remove_symlinks_to, p); - if (q < 0) { - if (r == 0) - r = q; - } else - *deleted = true; - } + q = mark_symlink_for_removal(&remove_symlinks_to, p); + if (q < 0) { + if (r == 0) + r = q; + } else + *deleted = true; } } } @@ -417,10 +442,8 @@ static int find_symlinks_fd( /* This will close nfd, regardless whether it succeeds or not */ q = find_symlinks_fd(name, nfd, p, config_path, same_name_link); - if (q > 0) return 1; - if (r == 0) r = q; @@ -508,36 +531,33 @@ static int find_symlinks_in_scope( UnitFileState *state) { int r; - _cleanup_free_ char *path2 = NULL; + _cleanup_free_ char *path = NULL; bool same_name_link_runtime = false, same_name_link = false; assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); assert(name); - if (scope == UNIT_FILE_SYSTEM || scope == UNIT_FILE_GLOBAL) { - _cleanup_free_ char *path = NULL; - /* First look in runtime config path */ - r = get_config_path(scope, true, root_dir, &path); - if (r < 0) - return r; + /* First look in runtime config path */ + r = get_config_path(scope, true, root_dir, &path); + if (r < 0) + return r; - r = find_symlinks(name, path, &same_name_link_runtime); - if (r < 0) - return r; - else if (r > 0) { - *state = UNIT_FILE_ENABLED_RUNTIME; - return r; - } + r = find_symlinks(name, path, &same_name_link_runtime); + if (r < 0) + return r; + else if (r > 0) { + *state = UNIT_FILE_ENABLED_RUNTIME; + return r; } /* Then look in the normal config path */ - r = get_config_path(scope, false, root_dir, &path2); + r = get_config_path(scope, false, root_dir, &path); if (r < 0) return r; - r = find_symlinks(name, path2, &same_name_link); + r = find_symlinks(name, path, &same_name_link); if (r < 0) return r; else if (r > 0) { @@ -595,7 +615,6 @@ int unit_file_mask( if (symlink("/dev/null", path) >= 0) { add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null"); - continue; } @@ -605,13 +624,9 @@ int unit_file_mask( continue; if (force) { - unlink(path); - - if (symlink("/dev/null", path) >= 0) { - + if (symlink_atomic("/dev/null", path) >= 0) { add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null"); - continue; } } @@ -647,7 +662,7 @@ int unit_file_unmask( goto finish; STRV_FOREACH(i, files) { - char *path; + _cleanup_free_ char *path = NULL; if (!unit_name_is_valid(*i, TEMPLATE_VALID)) { if (r == 0) @@ -663,21 +678,16 @@ int unit_file_unmask( q = null_or_empty_path(path); if (q > 0) { - if (unlink(path) >= 0) { - mark_symlink_for_removal(&remove_symlinks_to, path); + if (unlink(path) < 0) + q = -errno; + else { + q = mark_symlink_for_removal(&remove_symlinks_to, path); add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); - - free(path); - continue; } - - q = -errno; } if (q != -ENOENT && r == 0) r = q; - - free(path); } @@ -762,7 +772,6 @@ int unit_file_link( _cleanup_free_ char *dest = NULL; q = readlink_and_make_absolute(path, &dest); - if (q < 0 && errno != ENOENT) { if (r == 0) r = q; @@ -773,13 +782,9 @@ int unit_file_link( continue; if (force) { - unlink(path); - - if (symlink(*i, path) >= 0) { - + if (symlink_atomic(*i, path) >= 0) { add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, *i); - continue; } } @@ -830,19 +835,21 @@ static void install_info_free(InstallInfo *i) { strv_free(i->aliases); strv_free(i->wanted_by); strv_free(i->required_by); + strv_free(i->also); + free(i->default_instance); free(i); } -static void install_info_hashmap_free(Hashmap *m) { +static void install_info_hashmap_free(OrderedHashmap *m) { InstallInfo *i; if (!m) return; - while ((i = hashmap_steal_first(m))) + while ((i = ordered_hashmap_steal_first(m))) install_info_free(i); - hashmap_free(m); + ordered_hashmap_free(m); } static void install_context_done(InstallContext *c) { @@ -870,11 +877,11 @@ static int install_info_add( if (!unit_name_is_valid(name, TEMPLATE_VALID)) return -EINVAL; - if (hashmap_get(c->have_installed, name) || - hashmap_get(c->will_install, name)) + if (ordered_hashmap_get(c->have_installed, name) || + ordered_hashmap_get(c->will_install, name)) return 0; - r = hashmap_ensure_allocated(&c->will_install, string_hash_func, string_compare_func); + r = ordered_hashmap_ensure_allocated(&c->will_install, &string_hash_ops); if (r < 0) return r; @@ -896,7 +903,7 @@ static int install_info_add( } } - r = hashmap_put(c->will_install, i->name, i); + r = ordered_hashmap_put(c->will_install, i->name, i); if (r < 0) goto fail; @@ -922,55 +929,64 @@ static int install_info_add_auto( return install_info_add(c, name_or_path, NULL); } -static int config_parse_also(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - char *w; +static int config_parse_also( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + size_t l; - char *state; + const char *word, *state; InstallContext *c = data; + InstallInfo *i = userdata; assert(filename); assert(lvalue); assert(rvalue); - FOREACH_WORD_QUOTED(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(word, l, rvalue, state) { _cleanup_free_ char *n; int r; - n = strndup(w, l); + n = strndup(word, l); if (!n) return -ENOMEM; r = install_info_add(c, n, NULL); if (r < 0) return r; + + r = strv_extend(&i->also, n); + if (r < 0) + return r; } + if (!isempty(state)) + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Trailing garbage, ignoring."); return 0; } -static int config_parse_user(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +static int config_parse_user( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { InstallInfo *i = data; - char* printed; + char *printed; int r; assert(filename); @@ -987,29 +1003,75 @@ static int config_parse_user(const char *unit, return 0; } +static int config_parse_default_instance( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + InstallInfo *i = data; + char *printed; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + + r = install_full_printf(i, rvalue, &printed); + if (r < 0) + return r; + + if (!unit_instance_is_valid(printed)) { + free(printed); + return -EINVAL; + } + + free(i->default_instance); + i->default_instance = printed; + + return 0; +} + static int unit_file_load( InstallContext *c, InstallInfo *info, const char *path, - bool allow_symlink) { + const char *root_dir, + bool allow_symlink, + bool load, + bool *also) { const ConfigTableItem items[] = { - { "Install", "Alias", config_parse_strv, 0, &info->aliases }, - { "Install", "WantedBy", config_parse_strv, 0, &info->wanted_by }, - { "Install", "RequiredBy", config_parse_strv, 0, &info->required_by }, - { "Install", "Also", config_parse_also, 0, c }, - { "Exec", "User", config_parse_user, 0, info }, - { NULL, NULL, NULL, 0, NULL } + { "Install", "Alias", config_parse_strv, 0, &info->aliases }, + { "Install", "WantedBy", config_parse_strv, 0, &info->wanted_by }, + { "Install", "RequiredBy", config_parse_strv, 0, &info->required_by }, + { "Install", "DefaultInstance", config_parse_default_instance, 0, info }, + { "Install", "Also", config_parse_also, 0, c }, + { "Exec", "User", config_parse_user, 0, info }, + {} }; - int fd; _cleanup_fclose_ FILE *f = NULL; - int r; + int fd, r; assert(c); assert(info); assert(path); + if (!isempty(root_dir)) + path = strappenda(root_dir, "/", path); + + if (!load) { + r = access(path, F_OK) ? -errno : 0; + return r; + } + fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|(allow_symlink ? 0 : O_NOFOLLOW)); if (fd < 0) return -errno; @@ -1020,11 +1082,16 @@ static int unit_file_load( return -ENOMEM; } - r = config_parse(NULL, path, f, NULL, - config_item_table_lookup, (void*) items, true, true, info); + r = config_parse(NULL, path, f, + NULL, + config_item_table_lookup, items, + true, true, false, info); if (r < 0) return r; + if (also) + *also = !strv_isempty(info->also); + return (int) strv_length(info->aliases) + (int) strv_length(info->wanted_by) + @@ -1036,7 +1103,9 @@ static int unit_file_search( InstallInfo *info, LookupPaths *paths, const char *root_dir, - bool allow_symlink) { + bool allow_symlink, + bool load, + bool *also) { char **p; int r; @@ -1045,68 +1114,56 @@ static int unit_file_search( assert(info); assert(paths); - if (info->path) { - char *full_path = NULL; - - if (!isempty(root_dir)) - full_path = strappenda(root_dir, info->path); - - return unit_file_load(c, info, full_path ?: info->path, allow_symlink); - } + if (info->path) + return unit_file_load(c, info, info->path, root_dir, allow_symlink, load, also); assert(info->name); STRV_FOREACH(p, paths->unit_path) { - _cleanup_free_ char *path = NULL, *full_path = NULL; + _cleanup_free_ char *path = NULL; path = strjoin(*p, "/", info->name, NULL); if (!path) return -ENOMEM; - if (!isempty(root_dir)) { - full_path = strappend(root_dir, path); - if (!full_path) - return -ENOMEM; - } - - r = unit_file_load(c, info, full_path ?: path, allow_symlink); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load, also); if (r >= 0) { info->path = path; path = NULL; - } else if (r == -ENOENT && unit_name_is_instance(info->name)) { - /* Unit file doesn't exist, however instance enablement was requested. - * We will check if it is possible to load template unit file. */ - _cleanup_free_ char *template = NULL, *template_dir = NULL; + return r; + } + if (r != -ENOENT && r != -ELOOP) + return r; + } - template = unit_name_template(info->name); - if (!template) - return -ENOMEM; + if (unit_name_is_instance(info->name)) { + + /* Unit file doesn't exist, however instance + * enablement was requested. We will check if it is + * possible to load template unit file. */ - /* We will reuse path variable since we don't need it anymore. */ - template_dir = path; - *(strrchr(template_dir, '/') + 1) = '\0'; + _cleanup_free_ char *template = NULL; + + template = unit_name_template(info->name); + if (!template) + return -ENOMEM; - path = strappend(template_dir, template); + STRV_FOREACH(p, paths->unit_path) { + _cleanup_free_ char *path = NULL; + + path = strjoin(*p, "/", template, NULL); if (!path) return -ENOMEM; - if (!isempty(root_dir)) { - free(full_path); - full_path = strappend(root_dir, path); - if (!full_path) - return -ENOMEM; - } - - /* Let's try to load template unit. */ - r = unit_file_load(c, info, full_path ?: path, allow_symlink); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load, also); if (r >= 0) { info->path = path; path = NULL; + return r; } + if (r != -ENOENT && r != -ELOOP) + return r; } - - if (r != -ENOENT && r != -ELOOP) - return r; } return -ENOENT; @@ -1116,9 +1173,10 @@ static int unit_file_can_install( LookupPaths *paths, const char *root_dir, const char *name, - bool allow_symlink) { + bool allow_symlink, + bool *also) { - _cleanup_install_context_done_ InstallContext c = {}; + _cleanup_(install_context_done) InstallContext c = {}; InstallInfo *i; int r; @@ -1129,9 +1187,9 @@ static int unit_file_can_install( if (r < 0) return r; - assert_se(i = hashmap_first(c.will_install)); + assert_se(i = ordered_hashmap_first(c.will_install)); - r = unit_file_search(&c, i, paths, root_dir, allow_symlink); + r = unit_file_search(&c, i, paths, root_dir, allow_symlink, true, also); if (r >= 0) r = @@ -1175,17 +1233,14 @@ static int create_symlink( if (!force) return -EEXIST; - r = unlink(new_path); - if (r < 0 && errno != ENOENT) - return -errno; + r = symlink_atomic(old_path, new_path); + if (r < 0) + return r; - if (symlink(old_path, new_path) >= 0) { - add_file_change(changes, n_changes, UNIT_FILE_UNLINK, new_path, NULL); - add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path); - return 0; - } + add_file_change(changes, n_changes, UNIT_FILE_UNLINK, new_path, NULL); + add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path); - return -errno; + return 0; } static int install_info_symlink_alias( @@ -1223,54 +1278,37 @@ static int install_info_symlink_alias( static int install_info_symlink_wants( InstallInfo *i, const char *config_path, + char **list, + const char *suffix, bool force, UnitFileChange **changes, unsigned *n_changes) { + _cleanup_free_ char *buf = NULL; + const char *n; char **s; int r = 0, q; assert(i); assert(config_path); - STRV_FOREACH(s, i->wanted_by) { - _cleanup_free_ char *path = NULL, *dst = NULL; + if (unit_name_is_template(i->name)) { - q = install_full_printf(i, *s, &dst); - if (q < 0) - return q; + /* Don't install any symlink if there's no default + * instance configured */ - if (!unit_name_is_valid(dst, TEMPLATE_VALID)) { - r = -EINVAL; - continue; - } + if (!i->default_instance) + return 0; - if (asprintf(&path, "%s/%s.wants/%s", config_path, dst, i->name) < 0) + buf = unit_name_replace_instance(i->name, i->default_instance); + if (!buf) return -ENOMEM; - q = create_symlink(i->path, path, force, changes, n_changes); - - if (r == 0) - r = q; - } - - return r; -} - -static int install_info_symlink_requires( - InstallInfo *i, - const char *config_path, - bool force, - UnitFileChange **changes, - unsigned *n_changes) { - - char **s; - int r = 0, q; - - assert(i); - assert(config_path); + n = buf; + } else + n = i->name; - STRV_FOREACH(s, i->required_by) { + STRV_FOREACH(s, list) { _cleanup_free_ char *path = NULL, *dst = NULL; q = install_full_printf(i, *s, &dst); @@ -1282,11 +1320,11 @@ static int install_info_symlink_requires( continue; } - if (asprintf(&path, "%s/%s.requires/%s", config_path, dst, i->name) < 0) + path = strjoin(config_path, "/", dst, suffix, n, NULL); + if (!path) return -ENOMEM; q = create_symlink(i->path, path, force, changes, n_changes); - if (r == 0) r = q; } @@ -1298,12 +1336,13 @@ static int install_info_symlink_link( InstallInfo *i, LookupPaths *paths, const char *config_path, + const char *root_dir, bool force, UnitFileChange **changes, unsigned *n_changes) { - int r; _cleanup_free_ char *path = NULL; + int r; assert(i); assert(paths); @@ -1314,17 +1353,18 @@ static int install_info_symlink_link( if (r != 0) return r; - if (asprintf(&path, "%s/%s", config_path, i->name) < 0) + path = strjoin(config_path, "/", i->name, NULL); + if (!path) return -ENOMEM; - r = create_symlink(i->path, path, force, changes, n_changes); - return r; + return create_symlink(i->path, path, force, changes, n_changes); } static int install_info_apply( InstallInfo *i, LookupPaths *paths, const char *config_path, + const char *root_dir, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1337,15 +1377,15 @@ static int install_info_apply( r = install_info_symlink_alias(i, config_path, force, changes, n_changes); - q = install_info_symlink_wants(i, config_path, force, changes, n_changes); + q = install_info_symlink_wants(i, config_path, i->wanted_by, ".wants/", force, changes, n_changes); if (r == 0) r = q; - q = install_info_symlink_requires(i, config_path, force, changes, n_changes); + q = install_info_symlink_wants(i, config_path, i->required_by, ".requires/", force, changes, n_changes); if (r == 0) r = q; - q = install_info_symlink_link(i, paths, config_path, force, changes, n_changes); + q = install_info_symlink_link(i, paths, config_path, root_dir, force, changes, n_changes); if (r == 0) r = q; @@ -1362,21 +1402,27 @@ static int install_context_apply( unsigned *n_changes) { InstallInfo *i; - int r = 0, q; + int r, q; assert(c); assert(paths); assert(config_path); - while ((i = hashmap_first(c->will_install))) { + if (!ordered_hashmap_isempty(c->will_install)) { + r = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); + if (r < 0) + return r; - q = hashmap_ensure_allocated(&c->have_installed, string_hash_func, string_compare_func); - if (q < 0) - return q; + r = ordered_hashmap_reserve(c->have_installed, ordered_hashmap_size(c->will_install)); + if (r < 0) + return r; + } - assert_se(hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); + r = 0; + while ((i = ordered_hashmap_first(c->will_install))) { + assert_se(ordered_hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); - q = unit_file_search(c, i, paths, root_dir, false); + q = unit_file_search(c, i, paths, root_dir, false, true, NULL); if (q < 0) { if (r >= 0) r = q; @@ -1385,7 +1431,7 @@ static int install_context_apply( } else if (r >= 0) r += q; - q = install_info_apply(i, paths, config_path, force, changes, n_changes); + q = install_info_apply(i, paths, config_path, root_dir, force, changes, n_changes); if (r >= 0 && q < 0) r = q; } @@ -1401,7 +1447,7 @@ static int install_context_mark_for_removal( const char *root_dir) { InstallInfo *i; - int r = 0, q; + int r, q; assert(c); assert(paths); @@ -1409,15 +1455,21 @@ static int install_context_mark_for_removal( /* Marks all items for removal */ - while ((i = hashmap_first(c->will_install))) { + if (!ordered_hashmap_isempty(c->will_install)) { + r = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); + if (r < 0) + return r; - q = hashmap_ensure_allocated(&c->have_installed, string_hash_func, string_compare_func); - if (q < 0) - return q; + r = ordered_hashmap_reserve(c->have_installed, ordered_hashmap_size(c->will_install)); + if (r < 0) + return r; + } - assert_se(hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); + r = 0; + while ((i = ordered_hashmap_first(c->will_install))) { + assert_se(ordered_hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); - q = unit_file_search(c, i, paths, root_dir, false); + q = unit_file_search(c, i, paths, root_dir, false, true, NULL); if (q == -ENOENT) { /* do nothing */ } else if (q < 0) { @@ -1463,6 +1515,87 @@ static int install_context_mark_for_removal( return r; } +int unit_file_add_dependency( + UnitFileScope scope, + bool runtime, + const char *root_dir, + char **files, + char *target, + UnitDependency dep, + bool force, + UnitFileChange **changes, + unsigned *n_changes) { + + _cleanup_lookup_paths_free_ LookupPaths paths = {}; + _cleanup_(install_context_done) InstallContext c = {}; + _cleanup_free_ char *config_path = NULL; + char **i; + int r; + InstallInfo *info; + + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + + r = lookup_paths_init_from_scope(&paths, scope, root_dir); + if (r < 0) + return r; + + r = get_config_path(scope, runtime, root_dir, &config_path); + if (r < 0) + return r; + + STRV_FOREACH(i, files) { + UnitFileState state; + + state = unit_file_get_state(scope, root_dir, *i); + if (state < 0) + return log_error_errno(state, "Failed to get unit file state for %s: %m", *i); + + if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { + log_error("Failed to enable unit: Unit %s is masked", *i); + return -ENOTSUP; + } + + r = install_info_add_auto(&c, *i); + if (r < 0) + return r; + } + + if (!ordered_hashmap_isempty(c.will_install)) { + r = ordered_hashmap_ensure_allocated(&c.have_installed, &string_hash_ops); + if (r < 0) + return r; + + r = ordered_hashmap_reserve(c.have_installed, ordered_hashmap_size(c.will_install)); + if (r < 0) + return r; + } + + while ((info = ordered_hashmap_first(c.will_install))) { + assert_se(ordered_hashmap_move_one(c.have_installed, c.will_install, info->name) == 0); + + r = unit_file_search(&c, info, &paths, root_dir, false, false, NULL); + if (r < 0) + return r; + + if (dep == UNIT_WANTS) + r = strv_extend(&info->wanted_by, target); + else if (dep == UNIT_REQUIRES) + r = strv_extend(&info->required_by, target); + else + r = -EINVAL; + + if (r < 0) + return r; + + r = install_info_apply(info, &paths, config_path, root_dir, force, changes, n_changes); + if (r < 0) + return r; + } + + return 0; +} + int unit_file_enable( UnitFileScope scope, bool runtime, @@ -1473,7 +1606,7 @@ int unit_file_enable( unsigned *n_changes) { _cleanup_lookup_paths_free_ LookupPaths paths = {}; - _cleanup_install_context_done_ InstallContext c = {}; + _cleanup_(install_context_done) InstallContext c = {}; char **i; _cleanup_free_ char *config_path = NULL; int r; @@ -1490,6 +1623,17 @@ int unit_file_enable( return r; STRV_FOREACH(i, files) { + UnitFileState state; + + /* We only want to know if this unit is masked, so we ignore + * errors from unit_file_get_state, deferring other checks. + * This allows templated units to be enabled on the fly. */ + state = unit_file_get_state(scope, root_dir, *i); + if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { + log_error("Failed to enable unit: Unit %s is masked", *i); + return -ENOTSUP; + } + r = install_info_add_auto(&c, *i); if (r < 0) return r; @@ -1512,7 +1656,7 @@ int unit_file_disable( unsigned *n_changes) { _cleanup_lookup_paths_free_ LookupPaths paths = {}; - _cleanup_install_context_done_ InstallContext c = {}; + _cleanup_(install_context_done) InstallContext c = {}; char **i; _cleanup_free_ char *config_path = NULL; _cleanup_set_free_free_ Set *remove_symlinks_to = NULL; @@ -1538,7 +1682,7 @@ int unit_file_disable( r = install_context_mark_for_removal(&c, &paths, &remove_symlinks_to, config_path, root_dir); q = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files); - if (r == 0) + if (r >= 0) r = q; return r; @@ -1572,7 +1716,7 @@ int unit_file_set_default( unsigned *n_changes) { _cleanup_lookup_paths_free_ LookupPaths paths = {}; - _cleanup_install_context_done_ InstallContext c = {}; + _cleanup_(install_context_done) InstallContext c = {}; _cleanup_free_ char *config_path = NULL; char *path; int r; @@ -1597,9 +1741,9 @@ int unit_file_set_default( if (r < 0) return r; - assert_se(i = hashmap_first(c.will_install)); + assert_se(i = ordered_hashmap_first(c.will_install)); - r = unit_file_search(&c, i, &paths, root_dir, false); + r = unit_file_search(&c, i, &paths, root_dir, false, true, NULL); if (r < 0) return r; @@ -1633,11 +1777,7 @@ int unit_file_get_default( _cleanup_free_ char *path = NULL, *tmp = NULL; char *n; - if (isempty(root_dir)) - path = strappend(*p, "/" SPECIAL_DEFAULT_TARGET); - else - path = strjoin(root_dir, "/", *p, "/" SPECIAL_DEFAULT_TARGET, NULL); - + path = path_join(root_dir, *p, SPECIAL_DEFAULT_TARGET); if (!path) return -ENOMEM; @@ -1690,19 +1830,17 @@ UnitFileState unit_file_get_state( STRV_FOREACH(i, paths.unit_path) { struct stat st; char *partial; + bool also = false; free(path); path = NULL; - if (root_dir) - asprintf(&path, "%s/%s/%s", root_dir, *i, name); - else - asprintf(&path, "%s/%s", *i, name); + path = path_join(root_dir, *i, name); if (!path) return -ENOMEM; if (root_dir) - partial = path + strlen(root_dir) + 1; + partial = path + strlen(root_dir); else partial = path; @@ -1737,21 +1875,24 @@ UnitFileState unit_file_get_state( else if (r > 0) return state; - r = unit_file_can_install(&paths, root_dir, partial, true); + r = unit_file_can_install(&paths, root_dir, partial, true, &also); if (r < 0 && errno != ENOENT) return r; else if (r > 0) return UNIT_FILE_DISABLED; - else if (r == 0) + else if (r == 0) { + if (also) + return UNIT_FILE_INDIRECT; return UNIT_FILE_STATIC; + } } return r < 0 ? r : state; } -int unit_file_query_preset(UnitFileScope scope, const char *name) { +int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name) { _cleanup_strv_free_ char **files = NULL; - char **i; + char **p; int r; assert(scope >= 0); @@ -1759,7 +1900,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { assert(name); if (scope == UNIT_FILE_SYSTEM) - r = conf_files_list(&files, ".preset", NULL, + r = conf_files_list(&files, ".preset", root_dir, "/etc/systemd/system-preset", "/usr/local/lib/systemd/system-preset", "/usr/lib/systemd/system-preset", @@ -1768,7 +1909,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { #endif NULL); else if (scope == UNIT_FILE_GLOBAL) - r = conf_files_list(&files, ".preset", NULL, + r = conf_files_list(&files, ".preset", root_dir, "/etc/systemd/user-preset", "/usr/local/lib/systemd/user-preset", "/usr/lib/systemd/user-preset", @@ -1779,10 +1920,10 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { if (r < 0) return r; - STRV_FOREACH(i, files) { + STRV_FOREACH(p, files) { _cleanup_fclose_ FILE *f; - f = fopen(*i, "re"); + f = fopen(*p, "re"); if (!f) { if (errno == ENOENT) continue; @@ -1807,15 +1948,19 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { l += 6; l += strspn(l, WHITESPACE); - if (fnmatch(l, name, FNM_NOESCAPE) == 0) + if (fnmatch(l, name, FNM_NOESCAPE) == 0) { + log_debug("Preset file says enable %s.", name); return 1; + } } else if (first_word(l, "disable")) { l += 7; l += strspn(l, WHITESPACE); - if (fnmatch(l, name, FNM_NOESCAPE) == 0) + if (fnmatch(l, name, FNM_NOESCAPE) == 0) { + log_debug("Preset file says disable %s.", name); return 0; + } } else log_debug("Couldn't parse line '%s'", l); @@ -1823,6 +1968,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { } /* Default is "enable" */ + log_debug("Preset file doesn't say anything about %s, enabling.", name); return 1; } @@ -1836,7 +1982,7 @@ int unit_file_preset( UnitFileChange **changes, unsigned *n_changes) { - _cleanup_install_context_done_ InstallContext plus = {}, minus = {}; + _cleanup_(install_context_done) InstallContext plus = {}, minus = {}; _cleanup_lookup_paths_free_ LookupPaths paths = {}; _cleanup_free_ char *config_path = NULL; char **i; @@ -1844,7 +1990,7 @@ int unit_file_preset( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - assert(mode < _UNIT_FILE_PRESET_MODE_MAX); + assert(mode < _UNIT_FILE_PRESET_MAX); r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) @@ -1859,7 +2005,7 @@ int unit_file_preset( if (!unit_name_is_valid(*i, TEMPLATE_VALID)) return -EINVAL; - r = unit_file_query_preset(scope, *i); + r = unit_file_query_preset(scope, root_dir, *i); if (r < 0) return r; @@ -1904,7 +2050,7 @@ int unit_file_preset_all( UnitFileChange **changes, unsigned *n_changes) { - _cleanup_install_context_done_ InstallContext plus = {}, minus = {}; + _cleanup_(install_context_done) InstallContext plus = {}, minus = {}; _cleanup_lookup_paths_free_ LookupPaths paths = {}; _cleanup_free_ char *config_path = NULL; char **i; @@ -1912,7 +2058,7 @@ int unit_file_preset_all( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - assert(mode < _UNIT_FILE_PRESET_MODE_MAX); + assert(mode < _UNIT_FILE_PRESET_MAX); r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) @@ -1924,17 +2070,11 @@ int unit_file_preset_all( STRV_FOREACH(i, paths.unit_path) { _cleanup_closedir_ DIR *d = NULL; - _cleanup_free_ char *buf = NULL; - const char *units_dir; - - if (!isempty(root_dir)) { - buf = strjoin(root_dir, "/", *i, NULL); - if (!buf) - return -ENOMEM; + _cleanup_free_ char *units_dir; - units_dir = buf; - } else - units_dir = *i; + units_dir = path_join(root_dir, *i, NULL); + if (!units_dir) + return -ENOMEM; d = opendir(units_dir); if (!d) { @@ -1966,7 +2106,7 @@ int unit_file_preset_all( if (de->d_type != DT_REG) continue; - r = unit_file_query_preset(scope, de->d_name); + r = unit_file_query_preset(scope, root_dir, de->d_name); if (r < 0) return r; @@ -2002,14 +2142,15 @@ int unit_file_preset_all( return r; } -static void unitfilelist_free(UnitFileList **f) { - if (!*f) +static void unit_file_list_free_one(UnitFileList *f) { + if (!f) return; - free((*f)->path); - free(*f); + free(f->path); + free(f); } -#define _cleanup_unitfilelist_free_ _cleanup_(unitfilelist_free) + +DEFINE_TRIVIAL_CLEANUP_FUNC(UnitFileList*, unit_file_list_free_one); int unit_file_get_list( UnitFileScope scope, @@ -2027,23 +2168,23 @@ int unit_file_get_list( if (root_dir && scope != UNIT_FILE_SYSTEM) return -EINVAL; + if (root_dir) { + r = access(root_dir, F_OK); + if (r < 0) + return -errno; + } + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; STRV_FOREACH(i, paths.unit_path) { _cleanup_closedir_ DIR *d = NULL; - _cleanup_free_ char *buf = NULL; - const char *units_dir; - - if (!isempty(root_dir)) { - buf = strjoin(root_dir, "/", *i, NULL); - if (!buf) - return -ENOMEM; + _cleanup_free_ char *units_dir; - units_dir = buf; - } else - units_dir = *i; + units_dir = path_join(root_dir, *i, NULL); + if (!units_dir) + return -ENOMEM; d = opendir(units_dir); if (!d) { @@ -2054,8 +2195,9 @@ int unit_file_get_list( } for (;;) { - _cleanup_unitfilelist_free_ UnitFileList *f = NULL; + _cleanup_(unit_file_list_free_onep) UnitFileList *f = NULL; struct dirent *de; + _cleanup_free_ char *path = NULL; errno = 0; de = readdir(d); @@ -2105,7 +2247,11 @@ int unit_file_get_list( goto found; } - r = unit_file_can_install(&paths, root_dir, f->path, true); + path = path_make_absolute(de->d_name, *i); + if (!path) + return -ENOMEM; + + r = unit_file_can_install(&paths, root_dir, path, true, NULL); if (r == -EINVAL || /* Invalid setting? */ r == -EBADMSG || /* Invalid format? */ r == -ENOENT /* Included file not found? */) @@ -2137,6 +2283,7 @@ static const char* const unit_file_state_table[_UNIT_FILE_STATE_MAX] = { [UNIT_FILE_MASKED_RUNTIME] = "masked-runtime", [UNIT_FILE_STATIC] = "static", [UNIT_FILE_DISABLED] = "disabled", + [UNIT_FILE_INDIRECT] = "indirect", [UNIT_FILE_INVALID] = "invalid", }; @@ -2149,7 +2296,7 @@ static const char* const unit_file_change_type_table[_UNIT_FILE_CHANGE_TYPE_MAX] DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType); -static const char* const unit_file_preset_mode_table[_UNIT_FILE_PRESET_MODE_MAX] = { +static const char* const unit_file_preset_mode_table[_UNIT_FILE_PRESET_MAX] = { [UNIT_FILE_PRESET_FULL] = "full", [UNIT_FILE_PRESET_ENABLE_ONLY] = "enable-only", [UNIT_FILE_PRESET_DISABLE_ONLY] = "disable-only",