X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=ff5dcbac154c686d636733209c388afc8caa00d9;hp=c32d6599a68ef1906ebd949efb62d9c973722708;hb=e94937df954451eb4aa63573f0d7404ed2db987e;hpb=a2a5291b3f5ab6ed4c92f51d0fd10a03047380d8 diff --git a/src/shared/install.c b/src/shared/install.c index c32d6599a..ff5dcbac1 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -45,8 +45,6 @@ typedef struct { Hashmap *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; @@ -107,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; @@ -181,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; @@ -529,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) { @@ -886,7 +885,7 @@ static int install_info_add( hashmap_get(c->will_install, name)) return 0; - r = hashmap_ensure_allocated(&c->will_install, string_hash_func, string_compare_func); + r = hashmap_ensure_allocated(&c->will_install, &string_hash_ops); if (r < 0) return r; @@ -966,6 +965,9 @@ static int config_parse_also( if (r < 0) return r; } + if (!isempty(state)) + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Trailing garbage, ignoring."); return 0; } @@ -1024,8 +1026,10 @@ static int config_parse_default_instance( if (r < 0) return r; - if (!unit_instance_is_valid(printed)) + if (!unit_instance_is_valid(printed)) { + free(printed); return -EINVAL; + } free(i->default_instance); i->default_instance = printed; @@ -1038,7 +1042,8 @@ static int unit_file_load( InstallInfo *info, const char *path, const char *root_dir, - bool allow_symlink) { + bool allow_symlink, + bool load) { const ConfigTableItem items[] = { { "Install", "Alias", config_parse_strv, 0, &info->aliases }, @@ -1058,7 +1063,12 @@ static int unit_file_load( assert(path); if (!isempty(root_dir)) - path = strappenda3(root_dir, "/", path); + 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) @@ -1088,7 +1098,8 @@ static int unit_file_search( InstallInfo *info, LookupPaths *paths, const char *root_dir, - bool allow_symlink) { + bool allow_symlink, + bool load) { char **p; int r; @@ -1098,7 +1109,7 @@ static int unit_file_search( assert(paths); if (info->path) - return unit_file_load(c, info, info->path, root_dir, allow_symlink); + return unit_file_load(c, info, info->path, root_dir, allow_symlink, load); assert(info->name); @@ -1109,7 +1120,7 @@ static int unit_file_search( if (!path) return -ENOMEM; - r = unit_file_load(c, info, path, root_dir, allow_symlink); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load); if (r >= 0) { info->path = path; path = NULL; @@ -1138,7 +1149,7 @@ static int unit_file_search( if (!path) return -ENOMEM; - r = unit_file_load(c, info, path, root_dir, allow_symlink); + r = unit_file_load(c, info, path, root_dir, allow_symlink, load); if (r >= 0) { info->path = path; path = NULL; @@ -1158,7 +1169,7 @@ static int unit_file_can_install( const char *name, bool allow_symlink) { - _cleanup_install_context_done_ InstallContext c = {}; + _cleanup_(install_context_done) InstallContext c = {}; InstallInfo *i; int r; @@ -1171,7 +1182,7 @@ static int unit_file_can_install( assert_se(i = 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); if (r >= 0) r = @@ -1392,13 +1403,13 @@ static int install_context_apply( while ((i = hashmap_first(c->will_install))) { - q = hashmap_ensure_allocated(&c->have_installed, string_hash_func, string_compare_func); + q = hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); if (q < 0) return q; assert_se(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); if (q < 0) { if (r >= 0) r = q; @@ -1433,13 +1444,13 @@ static int install_context_mark_for_removal( while ((i = hashmap_first(c->will_install))) { - q = hashmap_ensure_allocated(&c->have_installed, string_hash_func, string_compare_func); + q = hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); if (q < 0) return q; assert_se(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); if (q == -ENOENT) { /* do nothing */ } else if (q < 0) { @@ -1485,6 +1496,83 @@ 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) { + 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; + } + + r = install_info_add_auto(&c, *i); + if (r < 0) + return r; + } + + while ((info = hashmap_first(c.will_install))) { + r = hashmap_ensure_allocated(&c.have_installed, &string_hash_ops); + if (r < 0) + return r; + + assert_se(hashmap_move_one(c.have_installed, c.will_install, info->name) == 0); + + r = unit_file_search(&c, info, &paths, root_dir, false, false); + 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, @@ -1495,7 +1583,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; @@ -1512,6 +1600,19 @@ int unit_file_enable( return r; STRV_FOREACH(i, files) { + 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 == 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; @@ -1534,7 +1635,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; @@ -1594,7 +1695,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; @@ -1621,7 +1722,7 @@ int unit_file_set_default( assert_se(i = 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); if (r < 0) return r; @@ -1856,7 +1957,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; @@ -1924,7 +2025,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; @@ -2016,14 +2117,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, @@ -2041,6 +2143,12 @@ 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; @@ -2062,8 +2170,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); @@ -2113,7 +2222,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); if (r == -EINVAL || /* Invalid setting? */ r == -EBADMSG || /* Invalid format? */ r == -ENOENT /* Included file not found? */)