X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=3d2b5ae77fef417f84e71a7bf448b90d73144434;hp=035b44cc520fe6aa118caa142c8333e17f5bfb03;hb=d76bb3c179b7a32b109e39aa87ff09c8f5a8c178;hpb=e95c98378ac2d34df864de4a9b785fd17defb77b diff --git a/src/shared/install.c b/src/shared/install.c index 035b44cc5..3d2b5ae77 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -36,7 +36,6 @@ #include "install.h" #include "conf-parser.h" #include "conf-files.h" -#include "specifier.h" #include "install-printf.h" #include "special.h" @@ -58,22 +57,6 @@ static int in_search_path(const char *path, char **search) { return strv_contains(search, parent); } -static int lookup_paths_init_from_scope(LookupPaths *paths, - UnitFileScope scope, - const char *root_dir) { - assert(paths); - assert(scope >= 0); - assert(scope < _UNIT_FILE_SCOPE_MAX); - - zero(*paths); - - return lookup_paths_init(paths, - scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER, - scope == UNIT_FILE_USER, - root_dir, - NULL, NULL, NULL); -} - static int get_config_path(UnitFileScope scope, bool runtime, const char *root_dir, char **ret) { char *p = NULL; int r; @@ -129,51 +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; - - 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; -} - static int mark_symlink_for_removal( Set **remove_symlinks_to, const char *p) { @@ -240,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); @@ -275,23 +213,23 @@ static int remove_marked_symlinks_fd( int q; bool found; - if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID)) + if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY)) continue; - if (unit_name_is_instance(de->d_name) && + if (unit_name_is_valid(de->d_name, UNIT_NAME_INSTANCE) && instance_whitelist && !strv_contains(instance_whitelist, de->d_name)) { - _cleanup_free_ char *w; + _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. */ - w = unit_name_template(de->d_name); - if (!w) - return -ENOMEM; + r = unit_name_template(de->d_name, &w); + if (r < 0) + return r; if (!strv_contains(instance_whitelist, w)) continue; @@ -326,7 +264,7 @@ static int remove_marked_symlinks_fd( path_kill_slashes(p); rmdir_parents(p, config_path); - add_file_change(changes, n_changes, UNIT_FILE_UNLINK, p, NULL); + unit_file_changes_add(changes, n_changes, UNIT_FILE_UNLINK, p, NULL); if (!set_get(remove_symlinks_to, p)) { @@ -415,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); @@ -531,20 +469,19 @@ static int find_symlinks_in_scope( UnitFileState *state) { int r; - _cleanup_free_ char *path = 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); - /* First look in runtime config path */ - r = get_config_path(scope, true, root_dir, &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); + r = find_symlinks(name, normal_path, &same_name_link_runtime); if (r < 0) return r; else if (r > 0) { @@ -553,11 +490,11 @@ static int find_symlinks_in_scope( } /* Then look in the normal config path */ - r = get_config_path(scope, false, root_dir, &path); + r = get_config_path(scope, false, root_dir, &runtime_path); if (r < 0) return r; - r = find_symlinks(name, path, &same_name_link); + r = find_symlinks(name, runtime_path, &same_name_link); if (r < 0) return r; else if (r > 0) { @@ -601,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; @@ -614,7 +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; } @@ -625,8 +562,8 @@ int unit_file_mask( if (force) { 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"); + 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; } } @@ -662,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; @@ -678,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); } @@ -740,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; @@ -769,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; } @@ -788,8 +720,8 @@ int unit_file_link( if (force) { 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); + 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; } } @@ -816,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; @@ -832,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); @@ -840,12 +817,13 @@ 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(OrderedHashmap *m) { - InstallInfo *i; + UnitFileInstallInfo *i; if (!m) return; @@ -869,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); @@ -878,7 +856,7 @@ 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 (ordered_hashmap_get(c->have_installed, name) || @@ -889,7 +867,7 @@ static int install_info_add( if (r < 0) return r; - i = new0(InstallInfo, 1); + i = new0(UnitFileInstallInfo, 1); if (!i) return -ENOMEM; @@ -948,6 +926,7 @@ static int config_parse_also( size_t l; const char *word, *state; InstallContext *c = data; + UnitFileInstallInfo *i = userdata; assert(filename); assert(lvalue); @@ -964,6 +943,10 @@ static int config_parse_also( 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, @@ -984,7 +967,7 @@ static int config_parse_user( void *data, void *userdata) { - InstallInfo *i = data; + UnitFileInstallInfo *i = data; char *printed; int r; @@ -1014,7 +997,7 @@ static int config_parse_default_instance( void *data, void *userdata) { - InstallInfo *i = data; + UnitFileInstallInfo *i = data; char *printed; int r; @@ -1039,11 +1022,12 @@ static int config_parse_default_instance( static int unit_file_load( InstallContext *c, - InstallInfo *info, + UnitFileInstallInfo *info, const char *path, const char *root_dir, bool allow_symlink, - bool load) { + bool load, + bool *also) { const ConfigTableItem items[] = { { "Install", "Alias", config_parse_strv, 0, &info->aliases }, @@ -1063,7 +1047,7 @@ static int unit_file_load( assert(path); if (!isempty(root_dir)) - path = strappenda(root_dir, "/", path); + path = strjoina(root_dir, "/", path); if (!load) { r = access(path, F_OK) ? -errno : 0; @@ -1087,6 +1071,9 @@ static int unit_file_load( if (r < 0) return r; + if (also) + *also = !strv_isempty(info->also); + return (int) strv_length(info->aliases) + (int) strv_length(info->wanted_by) + @@ -1095,11 +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 load) { + bool load, + bool *also) { char **p; int r; @@ -1109,7 +1097,7 @@ static int unit_file_search( assert(paths); if (info->path) - return unit_file_load(c, info, info->path, root_dir, allow_symlink, load); + return unit_file_load(c, info, info->path, root_dir, allow_symlink, load, also); assert(info->name); @@ -1120,7 +1108,7 @@ static int unit_file_search( if (!path) return -ENOMEM; - r = unit_file_load(c, info, path, root_dir, allow_symlink, load); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load, also); if (r >= 0) { info->path = path; path = NULL; @@ -1130,7 +1118,7 @@ static int unit_file_search( return r; } - if (unit_name_is_instance(info->name)) { + if (unit_name_is_valid(info->name, UNIT_NAME_INSTANCE)) { /* Unit file doesn't exist, however instance * enablement was requested. We will check if it is @@ -1138,9 +1126,9 @@ static int unit_file_search( _cleanup_free_ char *template = NULL; - template = unit_name_template(info->name); - if (!template) - return -ENOMEM; + r = unit_name_template(info->name, &template); + if (r < 0) + return r; STRV_FOREACH(p, paths->unit_path) { _cleanup_free_ char *path = NULL; @@ -1149,7 +1137,7 @@ static int unit_file_search( if (!path) return -ENOMEM; - r = unit_file_load(c, info, path, root_dir, allow_symlink, load); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load, also); if (r >= 0) { info->path = path; path = NULL; @@ -1164,13 +1152,14 @@ static int unit_file_search( } 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; + UnitFileInstallInfo *i; int r; assert(paths); @@ -1182,7 +1171,7 @@ static int unit_file_can_install( assert_se(i = ordered_hashmap_first(c.will_install)); - r = unit_file_search(&c, i, paths, root_dir, allow_symlink, true); + r = unit_file_search(&c, i, paths, root_dir, allow_symlink, true, also); if (r >= 0) r = @@ -1209,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; } @@ -1230,14 +1219,14 @@ static int create_symlink( if (r < 0) return r; - 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); + 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 0; } static int install_info_symlink_alias( - InstallInfo *i, + UnitFileInstallInfo *i, const char *config_path, bool force, UnitFileChange **changes, @@ -1269,7 +1258,7 @@ 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, @@ -1285,7 +1274,7 @@ static int install_info_symlink_wants( assert(i); assert(config_path); - if (unit_name_is_template(i->name)) { + if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE)) { /* Don't install any symlink if there's no default * instance configured */ @@ -1293,9 +1282,9 @@ static int install_info_symlink_wants( if (!i->default_instance) return 0; - buf = unit_name_replace_instance(i->name, i->default_instance); - if (!buf) - return -ENOMEM; + r = unit_name_replace_instance(i->name, i->default_instance, &buf); + if (r < 0) + return r; n = buf; } else @@ -1308,7 +1297,7 @@ static int install_info_symlink_wants( 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; } @@ -1326,8 +1315,8 @@ static int install_info_symlink_wants( } 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, @@ -1354,8 +1343,8 @@ static int install_info_symlink_link( } static int install_info_apply( - InstallInfo *i, - LookupPaths *paths, + UnitFileInstallInfo *i, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1387,14 +1376,14 @@ 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; + UnitFileInstallInfo *i; int r, q; assert(c); @@ -1415,7 +1404,7 @@ static int install_context_apply( 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, true); + q = unit_file_search(c, i, paths, root_dir, false, true, NULL); if (q < 0) { if (r >= 0) r = q; @@ -1434,12 +1423,12 @@ 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; + UnitFileInstallInfo *i; int r, q; assert(c); @@ -1462,7 +1451,7 @@ static int install_context_mark_for_removal( 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, true); + q = unit_file_search(c, i, paths, root_dir, false, true, NULL); if (q == -ENOENT) { /* do nothing */ } else if (q < 0) { @@ -1473,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); @@ -1491,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); @@ -1524,7 +1513,7 @@ int unit_file_add_dependency( _cleanup_free_ char *config_path = NULL; char **i; int r; - InstallInfo *info; + UnitFileInstallInfo *info; assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); @@ -1541,14 +1530,12 @@ int unit_file_add_dependency( UnitFileState state; state = unit_file_get_state(scope, root_dir, *i); - if (state < 0) { - log_error("Failed to get unit file state for %s: %s", *i, strerror(-state)); - return state; - } + 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; + return -EOPNOTSUPP; } r = install_info_add_auto(&c, *i); @@ -1569,7 +1556,7 @@ int unit_file_add_dependency( 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); + r = unit_file_search(&c, info, &paths, root_dir, false, false, NULL); if (r < 0) return r; @@ -1620,15 +1607,13 @@ int unit_file_enable( 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 < 0) { - log_error("Failed to get unit file state for %s: %s", *i, strerror(-state)); - return state; - } - if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { log_error("Failed to enable unit: Unit %s is masked", *i); - return -ENOTSUP; + return -EOPNOTSUPP; } r = install_info_add_auto(&c, *i); @@ -1717,7 +1702,7 @@ int unit_file_set_default( _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); @@ -1740,11 +1725,11 @@ int unit_file_set_default( assert_se(i = ordered_hashmap_first(c.will_install)); - r = unit_file_search(&c, i, &paths, root_dir, false, true); + 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) @@ -1799,38 +1784,28 @@ 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, root_dir); - 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; @@ -1849,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)) @@ -1859,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; } } @@ -1871,18 +1845,43 @@ 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; } +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 **p; @@ -1995,7 +1994,7 @@ 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, root_dir, *i); @@ -2088,10 +2087,10 @@ int unit_file_preset_all( 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; dirent_ensure_type(d, de); @@ -2191,6 +2190,7 @@ int unit_file_get_list( _cleanup_(unit_file_list_free_onep) UnitFileList *f = NULL; struct dirent *de; _cleanup_free_ char *path = NULL; + bool also = false; errno = 0; de = readdir(d); @@ -2200,10 +2200,10 @@ 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)) @@ -2244,7 +2244,7 @@ int unit_file_get_list( if (!path) return -ENOMEM; - r = unit_file_can_install(&paths, root_dir, path, true); + r = unit_file_can_install(&paths, root_dir, path, true, &also); if (r == -EINVAL || /* Invalid setting? */ r == -EBADMSG || /* Invalid format? */ r == -ENOENT /* Included file not found? */) @@ -2254,7 +2254,7 @@ int unit_file_get_list( else if (r > 0) f->state = UNIT_FILE_DISABLED; else - f->state = UNIT_FILE_STATIC; + f->state = also ? UNIT_FILE_INDIRECT : UNIT_FILE_STATIC; found: r = hashmap_put(h, basename(f->path), f); @@ -2264,7 +2264,7 @@ int unit_file_get_list( } } - return r; + return 0; } static const char* const unit_file_state_table[_UNIT_FILE_STATE_MAX] = { @@ -2276,6 +2276,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", };