core: don't send duplicate SIGCONT when killing units

[elogind.git] / src / nspawn / nspawn.c

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index cd63bf6a7fbd9de6b3e489b294cf3060940c0ba3..f904ebea6439c80edaa91411e5cc3f0c3a1b7978 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <sys/eventfd.h>
-#if HAVE_SELINUX
+#ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
 
@@ -117,6 +117,7 @@ static uint64_t arg_retain =
 static char **arg_bind = NULL;
 static char **arg_bind_ro = NULL;
 static char **arg_setenv = NULL;
+static bool arg_quiet = false;
 
 static int help(void) {
 
@@ -144,7 +145,8 @@ static int help(void) {
                "     --bind=PATH[:PATH]     Bind mount a file or directory from the host into\n"
                "                            the container\n"
                "     --bind-ro=PATH[:PATH]  Similar, but creates a read-only bind mount\n"
-               "     --setenv=NAME=VALUE    Pass an environment variable to PID 1\n",
+               "     --setenv=NAME=VALUE    Pass an environment variable to PID 1\n"
+               "  -q --quiet                Do not show status information\n",
                program_invocation_short_name);
 
         return 0;
@@ -184,6 +186,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "setenv",          required_argument, NULL, ARG_SETENV          },
                 { "process-label",   required_argument, NULL, 'Z'                 },
                 { "file-label",      required_argument, NULL, 'L'                 },
+                { "quiet",           no_argument,       NULL, 'q'                 },
                 {}
         };
 
@@ -192,7 +195,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "+hD:u:bL:M:jS:Z:", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "+hD:u:bL:M:jS:Z:q", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -373,6 +376,10 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
                 }
 
+                case 'q':
+                        arg_quiet = true;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -1025,7 +1032,7 @@ static int register_machine(pid_t pid) {
         _cleanup_bus_unref_ sd_bus *bus = NULL;
         int r;
 
-        r = sd_bus_open_system(&bus);
+        r = sd_bus_default_system(&bus);
         if (r < 0) {
                 log_error("Failed to open system bus: %s", strerror(-r));
                 return r;
@@ -1222,7 +1229,8 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_info("Spawning container %s on %s. Press ^] three times within 1s to abort execution.", arg_machine, arg_directory);
+        if (!arg_quiet)
+                log_info("Spawning container %s on %s. Press ^] three times within 1s to abort execution.", arg_machine, arg_directory);
 
         if (unlockpt(master) < 0) {
                 log_error("Failed to unlock tty: %m");
@@ -1526,7 +1534,7 @@ int main(int argc, char *argv[]) {
                         } else
                                 env_use = (char**) envp;
 
-#if HAVE_SELINUX
+#ifdef HAVE_SELINUX
                         if (arg_process_label)
                                 if (setexeccon(arg_process_label) < 0)
                                         log_error("setexeccon(\"%s\") failed: %m", arg_process_label);
@@ -1579,7 +1587,8 @@ int main(int argc, char *argv[]) {
                         break;
                 }
 
-                putc('\n', stdout);
+                if (!arg_quiet)
+                        putc('\n', stdout);
 
                 /* Kill if it is not dead yet anyway */
                 terminate_machine(pid);
@@ -1602,16 +1611,21 @@ int main(int argc, char *argv[]) {
                                 break;
                         }
 
-                        log_debug("Container %s exited successfully.", arg_machine);
+                        if (!arg_quiet)
+                                log_debug("Container %s exited successfully.", arg_machine);
                         break;
                 } else if (status.si_code == CLD_KILLED &&
                            status.si_status == SIGINT) {
-                        log_info("Container %s has been shut down.", arg_machine);
+
+                        if (!arg_quiet)
+                                log_info("Container %s has been shut down.", arg_machine);
                         r = 0;
                         break;
                 } else if (status.si_code == CLD_KILLED &&
                            status.si_status == SIGHUP) {
-                        log_info("Container %s is being rebooted.", arg_machine);
+
+                        if (!arg_quiet)
+                                log_info("Container %s is being rebooted.", arg_machine);
                         continue;
                 } else if (status.si_code == CLD_KILLED ||
                            status.si_code == CLD_DUMPED) {