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

persistant -> persistent

Browse source
This commit is contained in:
Kay Sievers 2012-01-18 21:47:30 +01:00
parent 31ed59c511
commit 891703e1ee
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
man/systemd.exec.xml
View file

@ -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

2
src/dbus-execute.c
View file

@ -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, }
};

12
src/execute.c
View file

@ -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)

2
src/execute.h
View file

@ -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

2
src/load-fragment-gperf.gperf.m4
View file

@ -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)