strv_free(i->aliases);
strv_free(i->wanted_by);
strv_free(i->required_by);
+ strv_free(i->also);
free(i->default_instance);
free(i);
}
size_t l;
const char *word, *state;
InstallContext *c = data;
+ InstallInfo *i = userdata;
assert(filename);
assert(lvalue);
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,
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 },
if (r < 0)
return r;
+ if (also)
+ *also = !strv_isempty(info->also);
+
return
(int) strv_length(info->aliases) +
(int) strv_length(info->wanted_by) +
LookupPaths *paths,
const char *root_dir,
bool allow_symlink,
- bool load) {
+ bool load,
+ bool *also) {
char **p;
int r;
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);
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;
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;
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;
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 =
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;
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) {
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;
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;
STRV_FOREACH(i, paths.unit_path) {
struct stat st;
char *partial;
+ bool also = false;
free(path);
path = NULL;
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;
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? */)
[UNIT_FILE_MASKED_RUNTIME] = "masked-runtime",
[UNIT_FILE_STATIC] = "static",
[UNIT_FILE_DISABLED] = "disabled",
+ [UNIT_FILE_INDIRECT] = "indirect",
[UNIT_FILE_INVALID] = "invalid",
};