chiark / gitweb /
nspawn: improve exit warning
authorLennart Poettering <lennart@poettering.net>
Mon, 14 Mar 2011 02:12:04 +0000 (03:12 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 14 Mar 2011 02:12:25 +0000 (03:12 +0100)
src/nspawn.c

index 4e4d40ea6f5c7f85e1fae4e3baaf69f267507327..fa70e86c469a96da81868f2a6726e5e9c272cac7 100644 (file)
@@ -366,7 +366,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (path_equal(arg_directory, "/")) {
         }
 
         if (path_equal(arg_directory, "/")) {
-                log_error("Spawning constainer on root directory not supported.");
+                log_error("Spawning container on root directory not supported.");
                 goto finish;
         }
 
                 goto finish;
         }
 
@@ -429,7 +429,7 @@ int main(int argc, char *argv[]) {
                 _exit(EXIT_FAILURE);
         }
 
                 _exit(EXIT_FAILURE);
         }
 
-        r = wait_for_terminate_and_warn("container", pid);
+        r = wait_for_terminate_and_warn(argc > optind ? argv[optind] : "bash", pid);
 
         if (r < 0)
                 r = EXIT_FAILURE;
 
         if (r < 0)
                 r = EXIT_FAILURE;