install: add new installer implementation
This new installer will replace the current code of "systemctl enable" but also be available via D-Bus. It adds a couple of new features: - Mask/Unmask calls - Reenable call - Preset call - Support for enabling units temporarily (i.e. in /run/systemd instead of /etc/systemd) - Enumeration of installed units - Support for out-of-search-path units systemctl and D-Bus are not hooked up with this yet
This commit is contained in:
Lennart Poettering
parent
09adcdf71d
commit
830964834f
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
test-install
|
||||
org.freedesktop.hostname1.xml
|
||||
org.freedesktop.locale1.xml
|
||||
org.freedesktop.timedate1.xml
|
||||
|
|
|
|||
16
Makefile.am
16
Makefile.am
|
|
@ -210,7 +210,8 @@ noinst_PROGRAMS = \
|
|||
test-cgroup \
|
||||
test-env-replace \
|
||||
test-strv \
|
||||
test-login
|
||||
test-login \
|
||||
test-install
|
||||
|
||||
if HAVE_PAM
|
||||
pamlib_LTLIBRARIES = \
|
||||
|
|
@ -831,6 +832,19 @@ test_login_LDADD = \
|
|||
libsystemd-basic.la \
|
||||
libsystemd-login.la
|
||||
|
||||
test_install_SOURCES = \
|
||||
src/test-install.c \
|
||||
src/install.c \
|
||||
src/path-lookup.c \
|
||||
src/unit-name.c
|
||||
|
||||
test_install_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
$(DBUS_CFLAGS)
|
||||
|
||||
test_install_LDADD = \
|
||||
libsystemd-basic.la
|
||||
|
||||
systemd_logger_SOURCES = \
|
||||
src/logger.c \
|
||||
src/tcpwrap.c
|
||||
|
|
|
|||
1944
src/install.c
Normal file
1944
src/install.c
Normal file
File diff suppressed because it is too large
Load diff
86
src/install.h
Normal file
86
src/install.h
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#ifndef fooinstallhfoo
|
||||
#define fooinstallhfoo
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2011 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "hashmap.h"
|
||||
|
||||
typedef enum UnitFileScope {
|
||||
UNIT_FILE_SYSTEM,
|
||||
UNIT_FILE_GLOBAL,
|
||||
UNIT_FILE_USER,
|
||||
_UNIT_FILE_SCOPE_MAX,
|
||||
_UNIT_FILE_SCOPE_INVALID = -1
|
||||
} UnitFileScope;
|
||||
|
||||
typedef enum UnitFileState {
|
||||
UNIT_FILE_ENABLED,
|
||||
UNIT_FILE_ENABLED_RUNTIME,
|
||||
UNIT_FILE_LINKED,
|
||||
UNIT_FILE_LINKED_RUNTIME,
|
||||
UNIT_FILE_MASKED,
|
||||
UNIT_FILE_MASKED_RUNTIME,
|
||||
UNIT_FILE_STATIC,
|
||||
UNIT_FILE_DISABLED,
|
||||
_UNIT_FILE_STATE_MAX,
|
||||
_UNIT_FILE_STATE_INVALID = -1
|
||||
} UnitFileState;
|
||||
|
||||
typedef enum UnitFileChangeType {
|
||||
UNIT_FILE_SYMLINK,
|
||||
UNIT_FILE_UNLINK,
|
||||
_UNIT_FILE_CHANGE_TYPE_MAX,
|
||||
_UNIT_FILE_CHANGE_TYPE_INVALID = -1
|
||||
} UnitFileChangeType;
|
||||
|
||||
typedef struct UnitFileChange {
|
||||
UnitFileChangeType type;
|
||||
char *path;
|
||||
char *source;
|
||||
} UnitFileChange;
|
||||
|
||||
typedef struct UnitFileList {
|
||||
char *path;
|
||||
UnitFileState state;
|
||||
} UnitFileList;
|
||||
|
||||
int unit_file_enable(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes);
|
||||
int unit_file_disable(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], UnitFileChange **changes, unsigned *n_changes);
|
||||
int unit_file_reenable(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes);
|
||||
int unit_file_link(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes);
|
||||
int unit_file_preset(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes);
|
||||
int unit_file_mask(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes);
|
||||
int unit_file_unmask(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], UnitFileChange **changes, unsigned *n_changes);
|
||||
|
||||
UnitFileState unit_file_get_state(UnitFileScope scope, const char *root_dir, const char *filename);
|
||||
|
||||
int unit_file_get_list(UnitFileScope scope, const char *root_dir, Hashmap *h);
|
||||
|
||||
void unit_file_list_free(Hashmap *h);
|
||||
void unit_file_changes_free(UnitFileChange *changes, unsigned n_changes);
|
||||
|
||||
int unit_file_query_preset(UnitFileScope scope, const char *name);
|
||||
|
||||
const char *unit_file_state_to_string(UnitFileState s);
|
||||
UnitFileState unit_file_state_from_string(const char *s);
|
||||
|
||||
#endif
|
||||
264
src/test-install.c
Normal file
264
src/test-install.c
Normal file
|
|
@ -0,0 +1,264 @@
|
|||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2011 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "install.h"
|
||||
|
||||
static void dump_changes(UnitFileChange *c, unsigned n) {
|
||||
unsigned i;
|
||||
|
||||
assert(n == 0 || c);
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
if (c[i].type == UNIT_FILE_UNLINK)
|
||||
printf("rm '%s'\n", c[i].path);
|
||||
else if (c[i].type == UNIT_FILE_SYMLINK)
|
||||
printf("ln -s '%s' '%s'\n", c[i].source, c[i].path);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
Hashmap *h;
|
||||
UnitFileList *p;
|
||||
Iterator i;
|
||||
int r;
|
||||
const char *const files[] = { "avahi-daemon.service", NULL };
|
||||
const char *const files2[] = { "/home/lennart/test.service", NULL };
|
||||
UnitFileChange *changes = NULL;
|
||||
unsigned n_changes = 0;
|
||||
|
||||
h = hashmap_new(string_hash_func, string_compare_func);
|
||||
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
|
||||
assert_se(r == 0);
|
||||
|
||||
HASHMAP_FOREACH(p, h, i) {
|
||||
UnitFileState s;
|
||||
|
||||
s = unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(p->path));
|
||||
|
||||
assert_se(p->state == s);
|
||||
|
||||
fprintf(stderr, "%s (%s)\n",
|
||||
p->path,
|
||||
unit_file_state_to_string(p->state));
|
||||
}
|
||||
|
||||
unit_file_list_free(h);
|
||||
|
||||
log_error("enable");
|
||||
|
||||
r = unit_file_enable(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
log_error("enable2");
|
||||
|
||||
r = unit_file_enable(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_ENABLED);
|
||||
|
||||
log_error("disable");
|
||||
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_disable(UNIT_FILE_SYSTEM, false, NULL, (char**) files, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_DISABLED);
|
||||
|
||||
log_error("mask");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_mask(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
log_error("mask2");
|
||||
r = unit_file_mask(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_MASKED);
|
||||
|
||||
log_error("unmask");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_unmask(UNIT_FILE_SYSTEM, false, NULL, (char**) files, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
log_error("unmask2");
|
||||
r = unit_file_unmask(UNIT_FILE_SYSTEM, false, NULL, (char**) files, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_DISABLED);
|
||||
|
||||
log_error("mask");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_mask(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_MASKED);
|
||||
|
||||
log_error("disable");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_disable(UNIT_FILE_SYSTEM, false, NULL, (char**) files, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
log_error("disable2");
|
||||
r = unit_file_disable(UNIT_FILE_SYSTEM, false, NULL, (char**) files, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_MASKED);
|
||||
|
||||
log_error("umask");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_unmask(UNIT_FILE_SYSTEM, false, NULL, (char**) files, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, files[0]) == UNIT_FILE_DISABLED);
|
||||
|
||||
log_error("enable files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_enable(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == UNIT_FILE_ENABLED);
|
||||
|
||||
log_error("disable files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_disable(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == _UNIT_FILE_STATE_INVALID);
|
||||
|
||||
log_error("link files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_link(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == UNIT_FILE_LINKED);
|
||||
|
||||
log_error("disable files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_disable(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == _UNIT_FILE_STATE_INVALID);
|
||||
|
||||
log_error("link files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_link(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == UNIT_FILE_LINKED);
|
||||
|
||||
log_error("reenable files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_reenable(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == UNIT_FILE_ENABLED);
|
||||
|
||||
log_error("disable files2");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_disable(UNIT_FILE_SYSTEM, false, NULL, (char**) files2, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files2[0])) == _UNIT_FILE_STATE_INVALID);
|
||||
log_error("preset files");
|
||||
changes = NULL;
|
||||
n_changes = 0;
|
||||
|
||||
r = unit_file_preset(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
|
||||
assert_se(r >= 0);
|
||||
|
||||
dump_changes(changes, n_changes);
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
|
||||
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL, file_name_from_path(files[0])) == UNIT_FILE_ENABLED);
|
||||
|
||||
return 0;
|
||||
}
|
||||
81
src/util.c
81
src/util.c
|
|
@ -1157,6 +1157,29 @@ int readlink_and_make_absolute(const char *p, char **r) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int readlink_and_canonicalize(const char *p, char **r) {
|
||||
char *t, *s;
|
||||
int j;
|
||||
|
||||
assert(p);
|
||||
assert(r);
|
||||
|
||||
j = readlink_and_make_absolute(p, &t);
|
||||
if (j < 0)
|
||||
return j;
|
||||
|
||||
s = canonicalize_file_name(t);
|
||||
if (s) {
|
||||
free(t);
|
||||
*r = s;
|
||||
} else
|
||||
*r = t;
|
||||
|
||||
path_kill_slashes(*r);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parent_of_path(const char *path, char **_r) {
|
||||
const char *e, *a = NULL, *b = NULL, *p;
|
||||
char *r;
|
||||
|
|
@ -3944,6 +3967,17 @@ bool null_or_empty(struct stat *st) {
|
|||
return false;
|
||||
}
|
||||
|
||||
int null_or_empty_path(const char *fn) {
|
||||
struct stat st;
|
||||
|
||||
assert(fn);
|
||||
|
||||
if (stat(fn, &st) < 0)
|
||||
return -errno;
|
||||
|
||||
return null_or_empty(&st);
|
||||
}
|
||||
|
||||
DIR *xopendirat(int fd, const char *name, int flags) {
|
||||
int nfd;
|
||||
DIR *d;
|
||||
|
|
@ -5268,6 +5302,53 @@ int glob_exists(const char *path) {
|
|||
return r;
|
||||
}
|
||||
|
||||
int dirent_ensure_type(DIR *d, struct dirent *de) {
|
||||
struct stat st;
|
||||
|
||||
assert(d);
|
||||
assert(de);
|
||||
|
||||
if (de->d_type != DT_UNKNOWN)
|
||||
return 0;
|
||||
|
||||
if (fstatat(dirfd(d), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0)
|
||||
return -errno;
|
||||
|
||||
de->d_type =
|
||||
S_ISREG(st.st_mode) ? DT_REG :
|
||||
S_ISDIR(st.st_mode) ? DT_DIR :
|
||||
S_ISLNK(st.st_mode) ? DT_LNK :
|
||||
S_ISFIFO(st.st_mode) ? DT_FIFO :
|
||||
S_ISSOCK(st.st_mode) ? DT_SOCK :
|
||||
S_ISCHR(st.st_mode) ? DT_CHR :
|
||||
S_ISBLK(st.st_mode) ? DT_BLK :
|
||||
DT_UNKNOWN;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int in_search_path(const char *path, char **search) {
|
||||
char **i, *parent;
|
||||
int r;
|
||||
|
||||
r = parent_of_path(path, &parent);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = 0;
|
||||
|
||||
STRV_FOREACH(i, search) {
|
||||
if (path_equal(parent, *i)) {
|
||||
r = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
free(parent);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static const char *const ioprio_class_table[] = {
|
||||
[IOPRIO_CLASS_NONE] = "none",
|
||||
[IOPRIO_CLASS_RT] = "realtime",
|
||||
|
|
|
|||
|
|
@ -217,6 +217,7 @@ char **replace_env_argv(char **argv, char **env);
|
|||
|
||||
int readlink_malloc(const char *p, char **r);
|
||||
int readlink_and_make_absolute(const char *p, char **r);
|
||||
int readlink_and_canonicalize(const char *p, char **r);
|
||||
|
||||
char *file_name_from_path(const char *p);
|
||||
bool is_path(const char *p);
|
||||
|
|
@ -385,6 +386,7 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid);
|
|||
_noreturn_ void freeze(void);
|
||||
|
||||
bool null_or_empty(struct stat *st);
|
||||
int null_or_empty_path(const char *fn);
|
||||
|
||||
DIR *xopendirat(int dirfd, const char *name, int flags);
|
||||
|
||||
|
|
@ -448,6 +450,10 @@ int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **h
|
|||
|
||||
int glob_exists(const char *path);
|
||||
|
||||
int dirent_ensure_type(DIR *d, struct dirent *de);
|
||||
|
||||
int in_search_path(const char *path, char **search);
|
||||
|
||||
#define NULSTR_FOREACH(i, l) \
|
||||
for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue