#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;
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;
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;
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) {
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;
if (!de)
break;
- if (ignore_file(de->d_name))
+ if (hidden_file(de->d_name))
continue;
dirent_ensure_type(d, de);
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;
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)) {
if (!de)
return r;
- if (ignore_file(de->d_name))
+ if (hidden_file(de->d_name))
continue;
dirent_ensure_type(d, de);
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) {
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;
}
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;
}
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;
}
}
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;
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);
}
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;
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;
}
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;
}
}
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;
free(changes);
}
-static void install_info_free(InstallInfo *i) {
+static void install_info_free(UnitFileInstallInfo *i) {
assert(i);
free(i->name);
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) {
InstallContext *c,
const char *name,
const char *path) {
- InstallInfo *i = NULL;
+ UnitFileInstallInfo *i = NULL;
int r;
assert(c);
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;
}
}
- r = hashmap_put(c->will_install, i->name, i);
+ r = ordered_hashmap_put(c->will_install, i->name, i);
if (r < 0)
goto fail;
size_t l;
const char *word, *state;
InstallContext *c = data;
+ UnitFileInstallInfo *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,
void *data,
void *userdata) {
- InstallInfo *i = data;
+ UnitFileInstallInfo *i = data;
char *printed;
int r;
void *data,
void *userdata) {
- InstallInfo *i = data;
+ UnitFileInstallInfo *i = data;
char *printed;
int r;
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;
static int unit_file_load(
InstallContext *c,
- InstallInfo *info,
+ UnitFileInstallInfo *info,
const char *path,
const char *root_dir,
- bool allow_symlink) {
+ bool allow_symlink,
+ bool load,
+ bool *also) {
const ConfigTableItem items[] = {
{ "Install", "Alias", config_parse_strv, 0, &info->aliases },
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;
+ return r;
+ }
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|(allow_symlink ? 0 : O_NOFOLLOW));
if (fd < 0)
if (r < 0)
return r;
+ if (also)
+ *also = !strv_isempty(info->also);
+
return
(int) strv_length(info->aliases) +
(int) strv_length(info->wanted_by) +
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;
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, also);
assert(info->name);
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, also);
if (r >= 0) {
info->path = path;
path = NULL;
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
_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;
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, also);
if (r >= 0) {
info->path = path;
path = NULL;
}
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);
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 =
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;
}
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,
}
static int install_info_symlink_wants(
- InstallInfo *i,
+ UnitFileInstallInfo *i,
const char *config_path,
char **list,
const char *suffix,
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 */
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
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;
}
}
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,
}
static int install_info_apply(
- InstallInfo *i,
- LookupPaths *paths,
+ UnitFileInstallInfo *i,
+ const LookupPaths *paths,
const char *config_path,
const char *root_dir,
bool force,
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;
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);
/* 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) {
} 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);
/* 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);
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,
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;
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;
_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);
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)
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;
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))
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;
}
}
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;
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);
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);
for (;;) {
_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);
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))
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, &also);
if (r == -EINVAL || /* Invalid setting? */
r == -EBADMSG || /* Invalid format? */
r == -ENOENT /* Included file not found? */)
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);
}
}
- return r;
+ return 0;
}
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",
};