shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-01 05:47:04 +03:00
Code

install: make sure that --root= mode doesn't make us consider all units outside of search path

Browse Source 
(cherry picked from commit 8f294b45cbb627d31342f6a79444be59ce7e2274)
This commit is contained in:
Lennart Poettering 2014-06-17 00:53:49 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent b83e096610
commit 9139b554df
3 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/shared/install.c
View File

@ -47,6 +47,37 @@ typedef struct {
#define _cleanup_install_context_done_ _cleanup_(install_context_done)
static int in_search_path(const char *path, char **search, const char *root_dir) {
_cleanup_free_ char *parent = NULL;
char **i;
int r;
assert(path);
r = path_get_parent(path, &parent);
if (r < 0)
return r;
STRV_FOREACH(i, search) {
_cleanup_free_ char *buf = NULL;
const char *p;
if (root_dir) {
buf = strjoin(root_dir, "/", *i, NULL);
if (!buf)
return -ENOMEM;
p = buf;
} else
p = *i;
if (path_equal(parent, p))
return 1;
}
return 0;
}
static int lookup_paths_init_from_scope(LookupPaths *paths,
UnitFileScope scope,
const char *root_dir) {
@ -757,7 +788,7 @@ int unit_file_link(
continue;
}
q = in_search_path(*i, paths.unit_path);
q = in_search_path(*i, paths.unit_path, root_dir);
if (q < 0)
return q;
@ -1315,6 +1346,7 @@ static int install_info_symlink_link(
InstallInfo *i,
LookupPaths *paths,
const char *config_path,
const char *root_dir,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@ -1327,7 +1359,7 @@ static int install_info_symlink_link(
assert(config_path);
assert(i->path);
r = in_search_path(i->path, paths->unit_path);
r = in_search_path(i->path, paths->unit_path, root_dir);
if (r != 0)
return r;
@ -1342,6 +1374,7 @@ static int install_info_apply(
InstallInfo *i,
LookupPaths *paths,
const char *config_path,
const char *root_dir,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@ -1362,7 +1395,7 @@ static int install_info_apply(
if (r == 0)
r = q;
q = install_info_symlink_link(i, paths, config_path, force, changes, n_changes);
q = install_info_symlink_link(i, paths, config_path, root_dir, force, changes, n_changes);
if (r == 0)
r = q;
@ -1402,7 +1435,7 @@ static int install_context_apply(
} else if (r >= 0)
r += q;
q = install_info_apply(i, paths, config_path, force, changes, n_changes);
q = install_info_apply(i, paths, config_path, root_dir, force, changes, n_changes);
if (r >= 0 && q < 0)
r = q;
}

16
src/shared/util.c
View File

@ -4461,22 +4461,6 @@ int dirent_ensure_type(DIR *d, struct dirent *de) {
return 0;
}
int in_search_path(const char *path, char **search) {
char **i;
_cleanup_free_ char *parent = NULL;
int r;
r = path_get_parent(path, &parent);
if (r < 0)
return r;
STRV_FOREACH(i, search)
if (path_equal(parent, *i))
return 1;
return 0;
}
int get_files_in_directory(const char *path, char ***list) {
_cleanup_closedir_ DIR *d = NULL;
size_t bufsize = 0, n = 0;

1
src/shared/util.h
View File

@ -518,7 +518,6 @@ int glob_extend(char ***strv, const char *path);
int dirent_ensure_type(DIR *d, struct dirent *de);
int in_search_path(const char *path, char **search);
int get_files_in_directory(const char *path, char ***list);
char *strjoin(const char *x, ...) _sentinel_;