Merge pull request #2888 from kinvolk/iaguis/remove-dots

run: remove period when printing started units
This commit is contained in:
Daniel Mack 2016-03-23 18:06:07 +01:00
commit 3288dcd390
2 changed files with 8 additions and 8 deletions

View file

@ -345,7 +345,7 @@
provided by systemd to services:</para>
<programlisting># systemd-run env
Running as unit run-19945.service.
Running as unit run-19945.service
# journalctl -u run-19945.service
Sep 08 07:37:21 bupkis systemd[1]: Starting /usr/bin/env...
Sep 08 07:37:21 bupkis systemd[1]: Started /usr/bin/env.
@ -366,8 +366,8 @@ Sep 08 07:37:21 bupkis env[19948]: BOOT_IMAGE=/vmlinuz-3.11.0-0.rc5.git6.2.fc20.
<programlisting># date; systemd-run --on-active=30 --timer-property=AccuracySec=100ms /bin/touch /tmp/foo
Mon Dec 8 20:44:24 KST 2014
Running as unit run-71.timer.
Will run as unit run-71.service.
Running as unit run-71.timer
Will run service as unit run-71.service
# journalctl -b -u run-71.timer
-- Logs begin at Fri 2014-12-05 19:09:21 KST, end at Mon 2014-12-08 20:44:54 KST. --
Dec 08 20:44:38 container systemd[1]: Starting /bin/touch /tmp/foo.

View file

@ -878,7 +878,7 @@ static int start_transient_service(
(void) sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
if (!arg_quiet)
log_info("Running as unit %s.\nPress ^] three times within 1s to disconnect TTY.", service);
log_info("Running as unit %s\nPress ^] three times within 1s to disconnect TTY.", service);
r = pty_forward_new(event, master, PTY_FORWARD_IGNORE_INITIAL_VHANGUP, &forward);
if (r < 0)
@ -896,7 +896,7 @@ static int start_transient_service(
fputc('\n', stdout);
} else if (!arg_quiet)
log_info("Running as unit %s.", service);
log_info("Running as unit %s", service);
return 0;
}
@ -1038,7 +1038,7 @@ static int start_transient_scope(
return r;
if (!arg_quiet)
log_info("Running scope as unit %s.", scope);
log_info("Running scope as unit %s", scope);
execvpe(argv[0], argv, env);
@ -1189,9 +1189,9 @@ static int start_transient_timer(
if (r < 0)
return r;
log_info("Running timer as unit %s.", timer);
log_info("Running timer as unit %s", timer);
if (argv[0])
log_info("Will run service as unit %s.", service);
log_info("Will run service as unit %s", service);
return 0;
}