shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

core: allow setting RemainAfterExit= for transient services

Browse Source
This commit is contained in:
Lennart Poettering 2013-07-26 16:09:25 +02:00
parent 39bdfa31f2
commit 6577c7cea7
3 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
man/systemd-run.xml
View File

@ -147,6 +147,19 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
instead of the <filename>system.slice</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--remain-after-exit</option></term>
<listitem><para>After the service's process terminated keep
the service around until it is explicitly stopped. This is
useful to collect runtime information about the service after
it finished running. Also see
<varname>RemainAfterExit=</varname> in
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para>
</listitem>
</varlistentry>
</variablelist>
<para>All command-line arguments after the first non-option

17
src/core/dbus-service.c
View File

@ -180,7 +180,22 @@ static int bus_service_set_transient_property(
assert(s);
assert(i);
if (streq(name, "ExecStart")) {
if (streq(name, "RemainAfterExit")) {
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
return -EINVAL;
if (mode != UNIT_CHECK) {
dbus_bool_t b;
dbus_message_iter_get_basic(i, &b);
s->remain_after_exit = b;
unit_write_drop_in_private_format(UNIT(s), mode, name, "RemainAfterExit=%s\n", yes_no(b));
}
return 1;
} else if (streq(name, "ExecStart")) {
DBusMessageIter sub;
unsigned n = 0;

43
src/run/run.c
View File

@ -31,6 +31,7 @@
static bool arg_scope = false;
static bool arg_user = false;
static bool arg_remain_after_exit = false;
static const char *arg_unit = NULL;
static const char *arg_description = NULL;
static const char *arg_slice = NULL;
@ -39,13 +40,14 @@ static int help(void) {
printf("%s [OPTIONS...] [COMMAND LINE...]\n\n"
"Run the specified command in a transient scope or service unit.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --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"
" --slice=SLICE Run in the specified slice\n",
" -h --help Show this help\n"
" --version Show package version\n"
" --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"
" --slice=SLICE Run in the specified slice\n"
" -r --remain-after-exit Leave service around until explicitly stopped\n",
program_invocation_short_name);
return 0;
@ -63,14 +65,15 @@ static int parse_argv(int argc, char *argv[]) {
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "user", no_argument, NULL, ARG_USER },
{ "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 },
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "user", no_argument, NULL, ARG_USER },
{ "scope", no_argument, NULL, ARG_SCOPE },
{ "unit", required_argument, NULL, ARG_UNIT },
{ "description", required_argument, NULL, ARG_DESCRIPTION },
{ "slice", required_argument, NULL, ARG_SLICE },
{ "remain-after-exit", required_argument, NULL, 'r' },
{ NULL, 0, NULL, 0 },
};
int c;
@ -78,7 +81,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) {
while ((c = getopt_long(argc, argv, "+hr", options, NULL)) >= 0) {
switch (c) {
@ -111,6 +114,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_slice = optarg;
break;
case 'r':
arg_remain_after_exit = true;
break;
case '?':
return -EINVAL;
@ -204,6 +211,10 @@ static int start_transient_service(
if (r < 0)
return r;
r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit);
if (r < 0)
return r;
r = sd_bus_message_open_container(m, 'r', "sv");
if (r < 0)
return r;