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=4ef7dc8d9812541e4d8a1d6516939d489e0c07b8;hb=32802361561403cb6441198c82d9c499e0513863;hpb=9f03ee51a2207954ef18be79ca3e11cd14ca56fd diff --git a/src/shared/install.c b/src/shared/install.c index 4ef7dc8d9..5bb338598 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -662,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) @@ -678,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); } @@ -840,6 +835,7 @@ 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); } @@ -948,6 +944,7 @@ static int config_parse_also( size_t l; const char *word, *state; InstallContext *c = data; + InstallInfo *i = userdata; assert(filename); assert(lvalue); @@ -964,6 +961,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, @@ -1043,7 +1044,8 @@ static int unit_file_load( 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 }, @@ -1087,6 +1089,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) + @@ -1099,7 +1104,8 @@ static int unit_file_search( LookupPaths *paths, const char *root_dir, bool allow_symlink, - bool load) { + bool load, + bool *also) { char **p; int r; @@ -1109,7 +1115,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 +1126,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; @@ -1149,7 +1155,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; @@ -1167,7 +1173,8 @@ 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 = {}; InstallInfo *i; @@ -1182,7 +1189,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 = @@ -1395,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 = ordered_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 = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); - if (q < 0) - return q; + r = ordered_hashmap_reserve(c->have_installed, ordered_hashmap_size(c->will_install)); + if (r < 0) + return r; + } + 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, true); + q = unit_file_search(c, i, paths, root_dir, false, true, NULL); if (q < 0) { if (r >= 0) r = q; @@ -1434,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); @@ -1442,15 +1455,21 @@ static int install_context_mark_for_removal( /* Marks all items for removal */ - while ((i = ordered_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 = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); - if (q < 0) - return q; + r = ordered_hashmap_reserve(c->have_installed, ordered_hashmap_size(c->will_install)); + if (r < 0) + return r; + } + 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, true); + q = unit_file_search(c, i, paths, root_dir, false, true, NULL); if (q == -ENOENT) { /* do nothing */ } else if (q < 0) { @@ -1529,10 +1548,8 @@ 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); @@ -1544,14 +1561,20 @@ int unit_file_add_dependency( return r; } - while ((info = ordered_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; + 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); + r = unit_file_search(&c, info, &paths, root_dir, false, false, NULL); if (r < 0) return r; @@ -1602,12 +1625,10 @@ 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; @@ -1661,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; @@ -1722,7 +1743,7 @@ 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; @@ -1809,6 +1830,7 @@ UnitFileState unit_file_get_state( STRV_FOREACH(i, paths.unit_path) { struct stat st; char *partial; + bool also = false; free(path); path = NULL; @@ -1853,13 +1875,16 @@ 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; @@ -2226,7 +2251,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, NULL); if (r == -EINVAL || /* Invalid setting? */ r == -EBADMSG || /* Invalid format? */ r == -ENOENT /* Included file not found? */) @@ -2258,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", };