X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=559fda211dbd95b581d0eccc171392e048f3cbc7;hp=62151d99d0cfbf1041cf0ffaaa0461f1cf74d049;hb=1f4b0911241d05c7651b876aff5bc9bb40913a15;hpb=f78e6385dc4cee0a1f399c4c89ebf823c108d447 diff --git a/src/shared/install.c b/src/shared/install.c index 62151d99d..559fda211 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -36,28 +36,25 @@ #include "install.h" #include "conf-parser.h" #include "conf-files.h" -#include "specifier.h" #include "install-printf.h" #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; -static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope) { - assert(paths); - assert(scope >= 0); - assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(path); - zero(*paths); + r = path_get_parent(path, &parent); + if (r < 0) + return r; - return lookup_paths_init(paths, - scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER, - scope == UNIT_FILE_USER, - NULL, NULL, NULL); + return strv_contains(search, parent); } static int get_config_path(UnitFileScope scope, bool runtime, const char *root_dir, char **ret) { @@ -72,15 +69,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: @@ -96,10 +88,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; @@ -116,47 +112,6 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d return 0; } -static int add_file_change( - UnitFileChange **changes, - unsigned *n_changes, - UnitFileChangeType type, - const char *path, - const char *source) { - - UnitFileChange *c; - unsigned i; - - assert(path); - assert(!changes == !n_changes); - - if (!changes) - return 0; - - c = realloc(*changes, (*n_changes + 1) * sizeof(UnitFileChange)); - if (!c) - return -ENOMEM; - - *changes = c; - i = *n_changes; - - c[i].type = type; - c[i].path = strdup(path); - if (!c[i].path) - return -ENOMEM; - - if (source) { - c[i].source = strdup(source); - if (!c[i].source) { - free(c[i].path); - return -ENOMEM; - } - } else - c[i].source = NULL; - - *n_changes = i+1; - return 0; -} - static int mark_symlink_for_removal( Set **remove_symlinks_to, const char *p) { @@ -166,7 +121,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; @@ -191,10 +146,10 @@ static int remove_marked_symlinks_fd( bool *deleted, UnitFileChange **changes, unsigned *n_changes, - char** files) { + char** instance_whitelist) { - int r = 0; _cleanup_closedir_ DIR *d = NULL; + int r = 0; assert(remove_symlinks_to); assert(fd >= 0); @@ -204,7 +159,7 @@ static int remove_marked_symlinks_fd( d = fdopendir(fd); if (!d) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } @@ -223,7 +178,7 @@ static int remove_marked_symlinks_fd( if (!de) break; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; dirent_ensure_type(d, de); @@ -244,14 +199,13 @@ static int remove_marked_symlinks_fd( p = path_make_absolute(de->d_name, path); if (!p) { - close_nointr_nofail(nfd); + safe_close(nfd); return -ENOMEM; } /* This will close nfd, regardless whether it succeeds or not */ - q = remove_marked_symlinks_fd(remove_symlinks_to, nfd, p, config_path, deleted, changes, n_changes, files); - - if (r == 0) + q = remove_marked_symlinks_fd(remove_symlinks_to, nfd, p, config_path, deleted, changes, n_changes, instance_whitelist); + if (q < 0 && r == 0) r = q; } else if (de->d_type == DT_LNK) { @@ -259,6 +213,28 @@ static int remove_marked_symlinks_fd( int q; bool found; + if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY)) + continue; + + if (unit_name_is_valid(de->d_name, UNIT_NAME_INSTANCE) && + instance_whitelist && + !strv_contains(instance_whitelist, de->d_name)) { + + _cleanup_free_ char *w = NULL; + + /* OK, the file is not listed directly + * in the whitelist, so let's check if + * the template of it might be + * listed. */ + + r = unit_name_template(de->d_name, &w); + if (r < 0) + return r; + + if (!strv_contains(instance_whitelist, w)) + continue; + } + p = path_make_absolute(de->d_name, path); if (!p) return -ENOMEM; @@ -277,31 +253,27 @@ static int remove_marked_symlinks_fd( set_get(remove_symlinks_to, dest) || set_get(remove_symlinks_to, basename(dest)); - if (unit_name_is_instance(p)) - found = found && strv_contains(files, basename(p)); + if (!found) + continue; + + if (unlink(p) < 0 && errno != ENOENT) { + if (r == 0) + r = -errno; + continue; + } - if (found) { + path_kill_slashes(p); + rmdir_parents(p, config_path); + unit_file_changes_add(changes, n_changes, UNIT_FILE_UNLINK, p, NULL); - if (unlink(p) < 0 && errno != ENOENT) { + if (!set_get(remove_symlinks_to, p)) { + q = mark_symlink_for_removal(&remove_symlinks_to, p); + if (q < 0) { if (r == 0) - r = -errno; - } else { - rmdir_parents(p, config_path); - path_kill_slashes(p); - - add_file_change(changes, n_changes, UNIT_FILE_UNLINK, p, NULL); - - 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; - } - } + r = q; + } else + *deleted = true; } } } @@ -314,9 +286,10 @@ static int remove_marked_symlinks( const char *config_path, UnitFileChange **changes, unsigned *n_changes, - char** files) { + char** instance_whitelist) { - int fd, r = 0; + _cleanup_close_ int fd = -1; + int r = 0; bool deleted; assert(config_path); @@ -332,20 +305,18 @@ static int remove_marked_symlinks( int q, cfd; deleted = false; - cfd = dup(fd); + cfd = fcntl(fd, F_DUPFD_CLOEXEC, 3); if (cfd < 0) { r = -errno; break; } /* This takes possession of cfd and closes it */ - q = remove_marked_symlinks_fd(remove_symlinks_to, cfd, config_path, config_path, &deleted, changes, n_changes, files); + q = remove_marked_symlinks_fd(remove_symlinks_to, cfd, config_path, config_path, &deleted, changes, n_changes, instance_whitelist); if (r == 0) r = q; } while (deleted); - close_nointr_nofail(fd); - return r; } @@ -367,7 +338,7 @@ static int find_symlinks_fd( d = fdopendir(fd); if (!d) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } @@ -382,7 +353,7 @@ static int find_symlinks_fd( if (!de) return r; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; dirent_ensure_type(d, de); @@ -403,16 +374,14 @@ static int find_symlinks_fd( p = path_make_absolute(de->d_name, path); if (!p) { - close_nointr_nofail(nfd); + safe_close(nfd); return -ENOMEM; } /* 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; @@ -469,8 +438,6 @@ static int find_symlinks_fd( return 1; } } - - return r; } static int find_symlinks( @@ -502,36 +469,32 @@ static int find_symlinks_in_scope( UnitFileState *state) { int r; - _cleanup_free_ char *path2 = NULL; + _cleanup_free_ char *normal_path = NULL, *runtime_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, &normal_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, normal_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, &runtime_path); if (r < 0) return r; - r = find_symlinks(name, path2, &same_name_link); + r = find_symlinks(name, runtime_path, &same_name_link); if (r < 0) return r; else if (r > 0) { @@ -556,13 +519,13 @@ int unit_file_mask( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { char **i; - _cleanup_free_ char *prefix; + _cleanup_free_ char *prefix = NULL; int r; assert(scope >= 0); @@ -575,7 +538,7 @@ int unit_file_mask( STRV_FOREACH(i, files) { _cleanup_free_ char *path = NULL; - if (!unit_name_is_valid(*i, TEMPLATE_VALID)) { + if (!unit_name_is_valid(*i, UNIT_NAME_ANY)) { if (r == 0) r = -EINVAL; continue; @@ -588,8 +551,7 @@ int unit_file_mask( } if (symlink("/dev/null", path) >= 0) { - add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null"); - + unit_file_changes_add(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null"); continue; } @@ -599,13 +561,9 @@ int unit_file_mask( continue; if (force) { - unlink(path); - - if (symlink("/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"); - + if (symlink_atomic("/dev/null", path) >= 0) { + unit_file_changes_add(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); + unit_file_changes_add(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null"); continue; } } @@ -625,7 +583,7 @@ int unit_file_unmask( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, UnitFileChange **changes, unsigned *n_changes) { @@ -641,9 +599,9 @@ 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 (!unit_name_is_valid(*i, UNIT_NAME_ANY)) { if (r == 0) r = -EINVAL; continue; @@ -657,21 +615,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); - add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); - - free(path); - continue; + if (unlink(path) < 0) + q = -errno; + else { + q = mark_symlink_for_removal(&remove_symlinks_to, path); + unit_file_changes_add(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); } - - q = -errno; } if (q != -ENOENT && r == 0) r = q; - - free(path); } @@ -690,7 +643,7 @@ int unit_file_link( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -703,7 +656,7 @@ int unit_file_link( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -719,7 +672,7 @@ int unit_file_link( fn = basename(*i); if (!path_is_absolute(*i) || - !unit_name_is_valid(fn, TEMPLATE_VALID)) { + !unit_name_is_valid(fn, UNIT_NAME_ANY)) { if (r == 0) r = -EINVAL; continue; @@ -748,7 +701,7 @@ int unit_file_link( return -ENOMEM; if (symlink(*i, path) >= 0) { - add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, *i); + unit_file_changes_add(changes, n_changes, UNIT_FILE_SYMLINK, path, *i); continue; } @@ -756,7 +709,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; @@ -767,13 +719,9 @@ int unit_file_link( continue; if (force) { - unlink(path); - - if (symlink(*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); - + if (symlink_atomic(*i, path) >= 0) { + unit_file_changes_add(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); + unit_file_changes_add(changes, n_changes, UNIT_FILE_SYMLINK, path, *i); continue; } } @@ -800,6 +748,51 @@ void unit_file_list_free(Hashmap *h) { hashmap_free(h); } +int unit_file_changes_add( + UnitFileChange **changes, + unsigned *n_changes, + UnitFileChangeType type, + const char *path, + const char *source) { + + UnitFileChange *c; + unsigned i; + + assert(path); + assert(!changes == !n_changes); + + if (!changes) + return 0; + + c = realloc(*changes, (*n_changes + 1) * sizeof(UnitFileChange)); + if (!c) + return -ENOMEM; + + *changes = c; + i = *n_changes; + + c[i].type = type; + c[i].path = strdup(path); + 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; + + *n_changes = i+1; + return 0; +} + void unit_file_changes_free(UnitFileChange *changes, unsigned n_changes) { unsigned i; @@ -816,7 +809,7 @@ void unit_file_changes_free(UnitFileChange *changes, unsigned n_changes) { free(changes); } -static void install_info_free(InstallInfo *i) { +static void install_info_free(UnitFileInstallInfo *i) { assert(i); free(i->name); @@ -824,19 +817,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) { - InstallInfo *i; +static void install_info_hashmap_free(OrderedHashmap *m) { + UnitFileInstallInfo *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) { @@ -852,7 +847,7 @@ static int install_info_add( InstallContext *c, const char *name, const char *path) { - InstallInfo *i = NULL; + UnitFileInstallInfo *i = NULL; int r; assert(c); @@ -861,18 +856,18 @@ static int install_info_add( if (!name) name = basename(path); - if (!unit_name_is_valid(name, TEMPLATE_VALID)) + if (!unit_name_is_valid(name, UNIT_NAME_ANY)) 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; - i = new0(InstallInfo, 1); + i = new0(UnitFileInstallInfo, 1); if (!i) return -ENOMEM; @@ -890,7 +885,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; @@ -916,55 +911,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; + UnitFileInstallInfo *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) { - - InstallInfo *i = data; - char* printed; +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) { + + UnitFileInstallInfo *i = data; + char *printed; int r; assert(filename); @@ -981,44 +985,95 @@ 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) { + + UnitFileInstallInfo *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, + UnitFileInstallInfo *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 = strjoina(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; f = fdopen(fd, "re"); if (!f) { - close_nointr_nofail(fd); + safe_close(fd); 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) + @@ -1027,10 +1082,12 @@ static int unit_file_load( static int unit_file_search( InstallContext *c, - InstallInfo *info, - LookupPaths *paths, + UnitFileInstallInfo *info, + const LookupPaths *paths, const char *root_dir, - bool allow_symlink) { + bool allow_symlink, + bool load, + bool *also) { char **p; int r; @@ -1040,83 +1097,69 @@ static int unit_file_search( assert(paths); if (info->path) - return unit_file_load(c, info, info->path, allow_symlink); + return unit_file_load(c, info, info->path, root_dir, allow_symlink, load, also); assert(info->name); STRV_FOREACH(p, paths->unit_path) { - char *path = NULL; - - if (isempty(root_dir)) - asprintf(&path, "%s/%s", *p, info->name); - else - asprintf(&path, "%s/%s/%s", root_dir, *p, info->name); + _cleanup_free_ char *path = NULL; + path = strjoin(*p, "/", info->name, NULL); if (!path) return -ENOMEM; - r = unit_file_load(c, info, path, allow_symlink); - - if (r >= 0) + r = unit_file_load(c, info, path, root_dir, allow_symlink, load, also); + if (r >= 0) { info->path = path; - 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. */ - char *template = NULL, - *template_path = NULL, - *template_dir = NULL; - - template = unit_name_template(info->name); - if (!template) { - free(path); - return -ENOMEM; - } + path = NULL; + return r; + } + if (r != -ENOENT && r != -ELOOP) + return r; + } - /* We will reuse path variable since we don't need it anymore. */ - template_dir = path; - *(strrchr(path, '/') + 1) = '\0'; + if (unit_name_is_valid(info->name, UNIT_NAME_INSTANCE)) { - template_path = strjoin(template_dir, template, NULL); - if (!template_path) { - free(path); - free(template); - return -ENOMEM; - } + /* Unit file doesn't exist, however instance + * enablement was requested. We will check if it is + * possible to load template unit file. */ - /* Let's try to load template unit. */ - r = unit_file_load(c, info, template_path, allow_symlink); - if (r >= 0) { - info->path = strdup(template_path); - if (!info->path) { - free(path); - free(template); - free(template_path); - return -ENOMEM; - } - } + _cleanup_free_ char *template = NULL; + + r = unit_name_template(info->name, &template); + if (r < 0) + return r; + + STRV_FOREACH(p, paths->unit_path) { + _cleanup_free_ char *path = NULL; + + path = strjoin(*p, "/", template, NULL); + if (!path) + return -ENOMEM; - free(template); - free(template_path); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load, also); + if (r >= 0) { + info->path = path; + path = NULL; + return r; } - free(path); + if (r != -ENOENT && r != -ELOOP) + return r; } - - if (r != -ENOENT && r != -ELOOP) - return r; } return -ENOENT; } static int unit_file_can_install( - LookupPaths *paths, + const LookupPaths *paths, const char *root_dir, const char *name, - bool allow_symlink) { + bool allow_symlink, + bool *also) { - _cleanup_install_context_done_ InstallContext c = {}; - InstallInfo *i; + _cleanup_(install_context_done) InstallContext c = {}; + UnitFileInstallInfo *i; int r; assert(paths); @@ -1126,9 +1169,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 = @@ -1155,7 +1198,7 @@ static int create_symlink( mkdir_parents_label(new_path, 0755); if (symlink(old_path, new_path) >= 0) { - add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path); + unit_file_changes_add(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path); return 0; } @@ -1172,19 +1215,18 @@ static int create_symlink( if (!force) return -EEXIST; - unlink(new_path); + 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; - } + unit_file_changes_add(changes, n_changes, UNIT_FILE_UNLINK, new_path, NULL); + unit_file_changes_add(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path); - return -errno; + return 0; } static int install_info_symlink_alias( - InstallInfo *i, + UnitFileInstallInfo *i, const char *config_path, bool force, UnitFileChange **changes, @@ -1216,72 +1258,55 @@ static int install_info_symlink_alias( } static int install_info_symlink_wants( - InstallInfo *i, + UnitFileInstallInfo *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_valid(i->name, UNIT_NAME_TEMPLATE)) { - 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 (asprintf(&path, "%s/%s.wants/%s", config_path, dst, i->name) < 0) - 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) { + if (!i->default_instance) + return 0; - char **s; - int r = 0, q; + r = unit_name_replace_instance(i->name, i->default_instance, &buf); + if (r < 0) + return r; - 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); if (q < 0) return q; - if (!unit_name_is_valid(dst, TEMPLATE_VALID)) { + if (!unit_name_is_valid(dst, UNIT_NAME_ANY)) { r = -EINVAL; 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; } @@ -1290,15 +1315,16 @@ static int install_info_symlink_requires( } static int install_info_symlink_link( - InstallInfo *i, - LookupPaths *paths, + UnitFileInstallInfo *i, + const 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); @@ -1309,17 +1335,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, + UnitFileInstallInfo *i, + const LookupPaths *paths, const char *config_path, + const char *root_dir, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1332,15 +1359,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; @@ -1349,29 +1376,35 @@ static int install_info_apply( static int install_context_apply( InstallContext *c, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, UnitFileChange **changes, unsigned *n_changes) { - InstallInfo *i; - int r = 0, q; + UnitFileInstallInfo *i; + 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; @@ -1380,7 +1413,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; } @@ -1390,13 +1423,13 @@ static int install_context_apply( static int install_context_mark_for_removal( InstallContext *c, - LookupPaths *paths, + const LookupPaths *paths, Set **remove_symlinks_to, const char *config_path, const char *root_dir) { - InstallInfo *i; - int r = 0, q; + UnitFileInstallInfo *i; + int r, q; assert(c); assert(paths); @@ -1404,15 +1437,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) { @@ -1423,13 +1462,13 @@ static int install_context_mark_for_removal( } else if (r >= 0) r += q; - if (unit_name_is_instance(i->name)) { + if (unit_name_is_valid(i->name, UNIT_NAME_INSTANCE)) { char *unit_file; if (i->path) { unit_file = basename(i->path); - if (unit_name_is_instance(unit_file)) + if (unit_name_is_valid(unit_file, UNIT_NAME_INSTANCE)) /* unit file named as instance exists, thus all symlinks * pointing to it will be removed */ q = mark_symlink_for_removal(remove_symlinks_to, i->name); @@ -1441,9 +1480,9 @@ static int install_context_mark_for_removal( /* If i->path is not set, it means that we didn't actually find * the unit file. But we can still remove symlinks to the * nonexistent template. */ - unit_file = unit_name_template(i->name); - if (!unit_file) - return log_oom(); + r = unit_name_template(i->name, &unit_file); + if (r < 0) + return r; q = mark_symlink_for_removal(remove_symlinks_to, unit_file); free(unit_file); @@ -1458,17 +1497,98 @@ 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; + UnitFileInstallInfo *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 -EOPNOTSUPP; + } + + 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, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, 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; @@ -1476,7 +1596,7 @@ int unit_file_enable( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1485,6 +1605,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 -EOPNOTSUPP; + } + r = install_info_add_auto(&c, *i); if (r < 0) return r; @@ -1494,20 +1625,20 @@ int unit_file_enable( supposed to be created, not the ones actually created. This is useful to determine whether the passed files had any installation data at all. */ - r = install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes); - return r; + + return install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes); } int unit_file_disable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, UnitFileChange **changes, 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; @@ -1516,7 +1647,7 @@ int unit_file_disable( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1533,7 +1664,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; @@ -1543,7 +1674,7 @@ int unit_file_reenable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1567,11 +1698,11 @@ 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; - InstallInfo *i = NULL; + UnitFileInstallInfo *i = NULL; assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); @@ -1580,7 +1711,7 @@ int unit_file_set_default( if (unit_name_to_type(file) != UNIT_TARGET) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1592,13 +1723,13 @@ 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; - path = strappenda(config_path, "/" SPECIAL_DEFAULT_TARGET); + path = strjoina(config_path, "/" SPECIAL_DEFAULT_TARGET); r = create_symlink(i->path, path, force, changes, n_changes); if (r < 0) @@ -1620,7 +1751,7 @@ int unit_file_get_default( assert(scope < _UNIT_FILE_SCOPE_MAX); assert(name); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1628,11 +1759,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; @@ -1657,44 +1784,36 @@ int unit_file_get_default( return -ENOENT; } -UnitFileState unit_file_get_state( +UnitFileState unit_file_lookup_state( UnitFileScope scope, const char *root_dir, + const LookupPaths *paths, const char *name) { - _cleanup_lookup_paths_free_ LookupPaths paths = {}; UnitFileState state = _UNIT_FILE_STATE_INVALID; char **i; _cleanup_free_ char *path = NULL; - int r; - - assert(scope >= 0); - assert(scope < _UNIT_FILE_SCOPE_MAX); - assert(name); + int r = 0; - if (root_dir && scope != UNIT_FILE_SYSTEM) - return -EINVAL; + assert(paths); - if (!unit_name_is_valid(name, TEMPLATE_VALID)) + if (!unit_name_is_valid(name, UNIT_NAME_ANY)) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope); - if (r < 0) - return r; - - STRV_FOREACH(i, paths.unit_path) { + STRV_FOREACH(i, paths->unit_path) { struct stat st; + char *partial; + bool also = false; free(path); - path = NULL; + path = path_join(root_dir, *i, name); + if (!path) + return -ENOMEM; if (root_dir) - asprintf(&path, "%s/%s/%s", root_dir, *i, name); + partial = path + strlen(root_dir); else - asprintf(&path, "%s/%s", *i, name); - - if (!path) - return -ENOMEM; + partial = path; /* * Search for a unit file in our default paths, to @@ -1705,7 +1824,7 @@ UnitFileState unit_file_get_state( if (errno != ENOENT) return r; - if (!unit_name_is_instance(name)) + if (!unit_name_is_valid(name, UNIT_NAME_INSTANCE)) continue; } else { if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) @@ -1715,8 +1834,7 @@ UnitFileState unit_file_get_state( if (r < 0 && r != -ENOENT) return r; else if (r > 0) { - state = path_startswith(*i, "/run") ? - UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED; + state = path_startswith(*i, "/run") ? UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED; return state; } } @@ -1727,21 +1845,46 @@ UnitFileState unit_file_get_state( else if (r > 0) return state; - r = unit_file_can_install(&paths, root_dir, path, 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) { +UnitFileState unit_file_get_state( + UnitFileScope scope, + const char *root_dir, + const char *name) { + + _cleanup_lookup_paths_free_ LookupPaths paths = {}; + int r; + + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(name); + + if (root_dir && scope != UNIT_FILE_SYSTEM) + return -EINVAL; + + r = lookup_paths_init_from_scope(&paths, scope, root_dir); + if (r < 0) + return r; + + return unit_file_lookup_state(scope, root_dir, &paths, 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); @@ -1749,7 +1892,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", @@ -1758,7 +1901,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", @@ -1769,10 +1912,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; @@ -1797,15 +1940,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); @@ -1813,6 +1960,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; } @@ -1820,22 +1968,23 @@ int unit_file_preset( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, + UnitFilePresetMode mode, bool force, UnitFileChange **changes, unsigned *n_changes) { + _cleanup_(install_context_done) InstallContext plus = {}, minus = {}; _cleanup_lookup_paths_free_ LookupPaths paths = {}; - _cleanup_install_context_done_ InstallContext plus = {}, minus = {}; - char **i; _cleanup_free_ char *config_path = NULL; - _cleanup_set_free_free_ Set *remove_symlinks_to = NULL; + char **i; int r, q; assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(mode < _UNIT_FILE_PRESET_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1845,47 +1994,155 @@ int unit_file_preset( STRV_FOREACH(i, files) { - if (!unit_name_is_valid(*i, TEMPLATE_VALID)) + if (!unit_name_is_valid(*i, UNIT_NAME_ANY)) return -EINVAL; - r = unit_file_query_preset(scope, *i); + r = unit_file_query_preset(scope, root_dir, *i); if (r < 0) return r; - if (r) + if (r && mode != UNIT_FILE_PRESET_DISABLE_ONLY) r = install_info_add_auto(&plus, *i); - else + else if (!r && mode != UNIT_FILE_PRESET_ENABLE_ONLY) r = install_info_add_auto(&minus, *i); - + else + r = 0; if (r < 0) return r; } - r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to, - config_path, root_dir); + r = 0; - q = remove_marked_symlinks(remove_symlinks_to, config_path, - changes, n_changes, files); - if (r == 0) - r = q; + if (mode != UNIT_FILE_PRESET_ENABLE_ONLY) { + _cleanup_set_free_free_ Set *remove_symlinks_to = NULL; - /* Returns number of symlinks that where supposed to be installed. */ - q = install_context_apply(&plus, &paths, config_path, root_dir, force, - changes, n_changes); - if (r == 0) - r = q; + r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to, config_path, root_dir); + + q = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files); + if (r == 0) + r = q; + } + + if (mode != UNIT_FILE_PRESET_DISABLE_ONLY) { + /* Returns number of symlinks that where supposed to be installed. */ + q = install_context_apply(&plus, &paths, config_path, root_dir, force, changes, n_changes); + if (r == 0) + r = q; + } return r; } -static void unitfilelist_free(UnitFileList **f) { - if (!*f) +int unit_file_preset_all( + UnitFileScope scope, + bool runtime, + const char *root_dir, + UnitFilePresetMode mode, + bool force, + UnitFileChange **changes, + unsigned *n_changes) { + + _cleanup_(install_context_done) InstallContext plus = {}, minus = {}; + _cleanup_lookup_paths_free_ LookupPaths paths = {}; + _cleanup_free_ char *config_path = NULL; + char **i; + int r, q; + + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(mode < _UNIT_FILE_PRESET_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, paths.unit_path) { + _cleanup_closedir_ DIR *d = NULL; + _cleanup_free_ char *units_dir; + + units_dir = path_join(root_dir, *i, NULL); + if (!units_dir) + return -ENOMEM; + + d = opendir(units_dir); + if (!d) { + if (errno == ENOENT) + continue; + + return -errno; + } + + for (;;) { + struct dirent *de; + + errno = 0; + de = readdir(d); + if (!de && errno != 0) + return -errno; + + if (!de) + break; + + if (hidden_file(de->d_name)) + continue; + + if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY)) + continue; + + dirent_ensure_type(d, de); + + if (de->d_type != DT_REG) + continue; + + r = unit_file_query_preset(scope, root_dir, de->d_name); + if (r < 0) + return r; + + if (r && mode != UNIT_FILE_PRESET_DISABLE_ONLY) + r = install_info_add_auto(&plus, de->d_name); + else if (!r && mode != UNIT_FILE_PRESET_ENABLE_ONLY) + r = install_info_add_auto(&minus, de->d_name); + else + r = 0; + if (r < 0) + return r; + } + } + + r = 0; + + if (mode != UNIT_FILE_PRESET_ENABLE_ONLY) { + _cleanup_set_free_free_ Set *remove_symlinks_to = NULL; + + r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to, config_path, root_dir); + + q = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, NULL); + if (r == 0) + r = q; + } + + if (mode != UNIT_FILE_PRESET_DISABLE_ONLY) { + q = install_context_apply(&plus, &paths, config_path, root_dir, force, changes, n_changes); + if (r == 0) + r = q; + } + + return r; +} + +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, @@ -1894,8 +2151,6 @@ int unit_file_get_list( _cleanup_lookup_paths_free_ LookupPaths paths = {}; char **i; - _cleanup_free_ char *buf = NULL; - _cleanup_closedir_ DIR *d = NULL; int r; assert(scope >= 0); @@ -1905,26 +2160,23 @@ int unit_file_get_list( if (root_dir && scope != UNIT_FILE_SYSTEM) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope); + 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) { - const char *units_dir; + _cleanup_closedir_ DIR *d = NULL; + _cleanup_free_ char *units_dir; - free(buf); - buf = NULL; - - if (root_dir) { - if (asprintf(&buf, "%s/%s", root_dir, *i) < 0) - return -ENOMEM; - - units_dir = buf; - } else - units_dir = *i; - - if (d) - closedir(d); + units_dir = path_join(root_dir, *i, NULL); + if (!units_dir) + return -ENOMEM; d = opendir(units_dir); if (!d) { @@ -1935,8 +2187,9 @@ int unit_file_get_list( } for (;;) { + _cleanup_(unit_file_list_free_onep) UnitFileList *f = NULL; struct dirent *de; - _cleanup_unitfilelist_free_ UnitFileList *f = NULL; + _cleanup_free_ char *path = NULL; errno = 0; de = readdir(d); @@ -1946,24 +2199,18 @@ int unit_file_get_list( if (!de) break; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; - if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID)) + if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY)) continue; if (hashmap_get(h, de->d_name)) continue; - r = dirent_ensure_type(d, de); - if (r < 0) { - if (r == -ENOENT) - continue; + dirent_ensure_type(d, de); - return r; - } - - if (de->d_type != DT_LNK && de->d_type != DT_REG) + if (!IN_SET(de->d_type, DT_LNK, DT_REG)) continue; f = new0(UnitFileList, 1); @@ -1992,7 +2239,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? */) @@ -2024,6 +2275,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", }; @@ -2035,3 +2287,11 @@ 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_MAX] = { + [UNIT_FILE_PRESET_FULL] = "full", + [UNIT_FILE_PRESET_ENABLE_ONLY] = "enable-only", + [UNIT_FILE_PRESET_DISABLE_ONLY] = "disable-only", +}; + +DEFINE_STRING_TABLE_LOOKUP(unit_file_preset_mode, UnitFilePresetMode);