picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: add support to run transient units in arbitrary slices

This commit is contained in:
Lennart Poettering 2013-07-01 03:02:42 +02:00
parent d28e9236e7
commit c221420be8
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/dbus-unit.c
View File

@ -790,6 +790,25 @@ static int bus_unit_set_transient_property(
return r;
return 1;
} else if (streq(name, "Slice") && unit_get_cgroup_context(u)) {
const char *s;
Unit *slice;
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING)
return -EINVAL;
dbus_message_iter_get_basic(i, &s);
r = manager_load_unit(u->manager, s, NULL, error, &slice);
if (r < 0)
return r;
if (slice->type != UNIT_SLICE)
return -EINVAL;
unit_ref_set(&u->slice, slice);
return 1;
}
return 0;

24
src/run/run.c
View File

@ -33,6 +33,7 @@ static bool arg_scope = false;
static bool arg_user = false;
static const char *arg_unit = NULL;
static const char *arg_description = NULL;
static const char *arg_slice = NULL;
static int help(void) {
@ -43,7 +44,8 @@ static int help(void) {
" --user Run as user unit\n"
" --scope Run this as scope rather than service\n"
" --unit=UNIT Run under the specified unit name\n"
" --description=TEXT Description for unit\n",
" --description=TEXT Description for unit\n"
" --slice=SLICE Run in the specified slice\n",
program_invocation_short_name);
return 0;
@ -56,7 +58,8 @@ static int parse_argv(int argc, char *argv[]) {
ARG_USER,
ARG_SCOPE,
ARG_UNIT,
ARG_DESCRIPTION
ARG_DESCRIPTION,
ARG_SLICE
};
static const struct option options[] = {
@ -66,6 +69,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "scope", no_argument, NULL, ARG_SCOPE },
{ "unit", required_argument, NULL, ARG_UNIT },
{ "description", required_argument, NULL, ARG_DESCRIPTION },
{ "slice", required_argument, NULL, ARG_SLICE },
{ NULL, 0, NULL, 0 },
};
@ -103,6 +107,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_description = optarg;
break;
case ARG_SLICE:
arg_slice = optarg;
break;
case '?':
return -EINVAL;
@ -147,6 +155,18 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu
if (r < 0)
return r;
if (!isempty(arg_slice)) {
_cleanup_free_ char *slice;
slice = unit_name_mangle_with_suffix(arg_slice, ".slice");
if (!slice)
return -ENOMEM;
r = sd_bus_message_append(m, "(sv)", "Slice", "s", slice);
if (r < 0)
return r;
}
*ret = m;
m = NULL;