summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/systemd.exec.xml4
-rw-r--r--src/dbus-execute.c2
-rw-r--r--src/execute.c12
-rw-r--r--src/execute.h2
-rw-r--r--src/load-fragment-gperf.gperf.m42
5 files changed, 11 insertions, 11 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 97bdbba560..9d074ca5ee 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -777,11 +777,11 @@
</varlistentry>
<varlistentry>
- <term><varname>ControlGroupPersistant=</varname></term>
+ <term><varname>ControlGroupPersistent=</varname></term>
<listitem><para>Takes a boolean
argument. If true, the control groups
created for this unit will be marked
- to be persistant, i.e. systemd will
+ to be persistent, i.e. systemd will
not remove them when stopping the
unit. The default is false, meaning
that the control groups will be
diff --git a/src/dbus-execute.c b/src/dbus-execute.c
index e02d61ca8b..925cbb5123 100644
--- a/src/dbus-execute.c
+++ b/src/dbus-execute.c
@@ -416,6 +416,6 @@ const BusProperty bus_exec_context_properties[] = {
{ "KillSignal", bus_property_append_int, "i", offsetof(ExecContext, kill_signal) },
{ "UtmpIdentifier", bus_property_append_string, "s", offsetof(ExecContext, utmp_id), true },
{ "ControlGroupModify", bus_property_append_bool, "b", offsetof(ExecContext, control_group_modify) },
- { "ControlGroupModify", bus_property_append_bool, "b", offsetof(ExecContext, control_group_persistant) },
+ { "ControlGroupModify", bus_property_append_bool, "b", offsetof(ExecContext, control_group_persistent) },
{ NULL, }
};
diff --git a/src/execute.c b/src/execute.c
index 650c6c1436..13f4561f27 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -1218,7 +1218,7 @@ int exec_spawn(ExecCommand *command,
if (cgroup_bondings && context->control_group_modify) {
err = cgroup_bonding_set_group_access_list(cgroup_bondings, 0755, uid, gid);
if (err >= 0)
- err = cgroup_bonding_set_task_access_list(cgroup_bondings, 0644, uid, gid, context->control_group_persistant);
+ err = cgroup_bonding_set_task_access_list(cgroup_bondings, 0644, uid, gid, context->control_group_persistent);
if (err < 0) {
r = EXIT_CGROUP;
goto fail_child;
@@ -1228,8 +1228,8 @@ int exec_spawn(ExecCommand *command,
}
}
- if (cgroup_bondings && !set_access && context->control_group_persistant >= 0) {
- err = cgroup_bonding_set_task_access_list(cgroup_bondings, (mode_t) -1, (uid_t) -1, (uid_t) -1, context->control_group_persistant);
+ if (cgroup_bondings && !set_access && context->control_group_persistent >= 0) {
+ err = cgroup_bonding_set_task_access_list(cgroup_bondings, (mode_t) -1, (uid_t) -1, (uid_t) -1, context->control_group_persistent);
if (err < 0) {
r = EXIT_CGROUP;
goto fail_child;
@@ -1498,7 +1498,7 @@ void exec_context_init(ExecContext *c) {
c->mount_flags = MS_SHARED;
c->kill_signal = SIGTERM;
c->send_sigkill = true;
- c->control_group_persistant = -1;
+ c->control_group_persistent = -1;
}
void exec_context_done(ExecContext *c) {
@@ -1684,7 +1684,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
"%sNonBlocking: %s\n"
"%sPrivateTmp: %s\n"
"%sControlGroupModify: %s\n"
- "%sControlGroupPersistant: %s\n"
+ "%sControlGroupPersistent: %s\n"
"%sPrivateNetwork: %s\n",
prefix, c->umask,
prefix, c->working_directory ? c->working_directory : "/",
@@ -1692,7 +1692,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
prefix, yes_no(c->non_blocking),
prefix, yes_no(c->private_tmp),
prefix, yes_no(c->control_group_modify),
- prefix, yes_no(c->control_group_persistant),
+ prefix, yes_no(c->control_group_persistent),
prefix, yes_no(c->private_network));
STRV_FOREACH(e, c->environment)
diff --git a/src/execute.h b/src/execute.h
index ff33fa92df..ed90c6e3ed 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -163,7 +163,7 @@ struct ExecContext {
bool private_network;
bool control_group_modify;
- int control_group_persistant;
+ int control_group_persistent;
/* This is not exposed to the user but available
* internally. We need it to make sure that whenever we spawn
diff --git a/src/load-fragment-gperf.gperf.m4 b/src/load-fragment-gperf.gperf.m4
index 8adedc59e0..8ca799ef21 100644
--- a/src/load-fragment-gperf.gperf.m4
+++ b/src/load-fragment-gperf.gperf.m4
@@ -87,7 +87,7 @@ $1.KillSignal, config_parse_kill_signal, 0,
$1.SendSIGKILL, config_parse_bool, 0, offsetof($1, exec_context.send_sigkill)
$1.UtmpIdentifier, config_parse_unit_string_printf, 0, offsetof($1, exec_context.utmp_id)
$1.ControlGroupModify, config_parse_bool, 0, offsetof($1, exec_context.control_group_modify)
-$1.ControlGroupPersistant, config_parse_tristate, 0, offsetof($1, exec_context.control_group_persistant)'
+$1.ControlGroupPersistent, config_parse_tristate, 0, offsetof($1, exec_context.control_group_persistent)'
)m4_dnl
Unit.Names, config_parse_unit_names, 0, 0
Unit.Description, config_parse_unit_string_printf, 0, offsetof(Unit, description)