[systemd-commits] 2 commits - src/core src/nspawn

[Zbigniew Jędrzejewski-Szmek]

 src/core/busname.c  |    2 +-
 src/nspawn/nspawn.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2ba5d84c491d6a593f2c077c63dffb6319b9590d
Author: Colin Ian King <colin.king at canonical.com>
Date:   Fri Jun 6 23:06:33 2014 +0100

    Fix spelling mistake, proces -> process

diff --git a/src/core/busname.c b/src/core/busname.c
index 6be1b8b..2752415 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -446,7 +446,7 @@ static void busname_enter_signal(BusName *n, BusNameState state, BusNameResult f
                               n->control_pid,
                               false);
         if (r < 0) {
-                log_warning_unit(UNIT(n)->id, "%s failed to kill control proces: %s", UNIT(n)->id, strerror(-r));
+                log_warning_unit(UNIT(n)->id, "%s failed to kill control process: %s", UNIT(n)->id, strerror(-r));
                 goto fail;
         }
 

commit 45f1386c9adf0e2892306e8949ca71f4a52a8d36
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed May 28 12:39:38 2014 -0400

    nspawn: split long message into two lines
    
    For names like /var/lib/container/something, the message
    becomes quite long. Better to split it.
    
    Also reword the message not to suggest that ^]^]^] only works
    in the beginning.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 19fb086..26ac1bf 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2787,7 +2787,8 @@ int main(int argc, char *argv[]) {
         }
 
         if (!arg_quiet)
-                log_info("Spawning container %s on %s. Press ^] three times within 1s to abort execution.", arg_machine, arg_image ? arg_image : arg_directory);
+                log_info("Spawning container %s on %s.\nPress ^] three times within 1s to kill container.",
+                         arg_machine, arg_image ? arg_image : arg_directory);
 
         if (unlockpt(master) < 0) {
                 log_error("Failed to unlock tty: %m");