X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=ce37c59e8155c713ded07cc5cc1a0e6846e24a0c;hp=300567a922d762563d9f8064263f48a587792688;hb=82c28f5621ad80585eb6c232a988af955a07060c;hpb=ee05e7795bb9ad7d1212dd49ad362f3e9603c4fd

diff --git a/src/core/main.c b/src/core/main.c
index 300567a92..ce37c59e8 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -42,9 +42,7 @@
 #include "sd-daemon.h"
 #include "sd-messages.h"
 #include "sd-bus.h"
-#include "manager.h"
 #include "log.h"
-#include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"
 #include "conf-parser.h"
@@ -64,9 +62,12 @@
 #include "env-util.h"
 #include "clock-util.h"
 #include "fileio.h"
-#include "dbus-manager.h"
 #include "bus-error.h"
 #include "bus-util.h"
+#include "selinux-util.h"
+#include "manager.h"
+#include "dbus-manager.h"
+#include "load-fragment.h"
 
 #include "mount-setup.h"
 #include "loopback-setup.h"
@@ -223,12 +224,17 @@ noreturn static void crash(int sig) {
 }
 
 static void install_crash_handler(void) {
-        struct sigaction sa = {
+        static const struct sigaction sa = {
                 .sa_handler = crash,
-                .sa_flags = SA_NODEFER,
+                .sa_flags = SA_NODEFER, /* So that we can raise the signal again from the signal handler */
         };
+        int r;
 
-        sigaction_many(&sa, SIGNALS_CRASH_HANDLER, -1);
+        /* We ignore the return value here, since, we don't mind if we
+         * cannot set up a crash handler */
+        r = sigaction_many(&sa, SIGNALS_CRASH_HANDLER, -1);
+        if (r < 0)
+                log_debug_errno(r, "I had trouble setting up the crash handler, ignoring: %m");
 }
 
 static int console_setup(void) {
@@ -1103,7 +1109,7 @@ static void test_usr(void) {
         if (dir_is_empty("/usr") <= 0)
                 return;
 
-        log_warning("/usr appears to be on its own filesytem and is not already mounted. This is not a supported setup. "
+        log_warning("/usr appears to be on its own filesystem and is not already mounted. This is not a supported setup. "
                     "Some things will probably break (sometimes even silently) in mysterious ways. "
                     "Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
 }
@@ -1111,7 +1117,7 @@ static void test_usr(void) {
 static int initialize_join_controllers(void) {
         /* By default, mount "cpu" + "cpuacct" together, and "net_cls"
          * + "net_prio". We'd like to add "cpuset" to the mix, but
-         * "cpuset" does't really work for groups with no initialized
+         * "cpuset" doesn't really work for groups with no initialized
          * attributes. */
 
         arg_join_controllers = new(char**, 3);