X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=56a1f6193c974d2316fd93b784b7bf7768e166e2;hb=0c2a5d721ece665618614d05049975ad84a9ee4a;hp=a0a6ae1f0ab3e23950def6a5a61ce70322ecbb14;hpb=fa1b91632c5220e6589007af4cd573ca909f915a;p=elogind.git

diff --git a/src/core/main.c b/src/core/main.c
index a0a6ae1f0..56a1f6193 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1293,11 +1293,11 @@ int main(int argc, char *argv[]) {
                 if (!skip_setup) {
                         mount_setup_early();
                         dual_timestamp_get(&security_start_timestamp);
-                        if (selinux_setup(&loaded_policy) < 0)
+                        if (mac_selinux_setup(&loaded_policy) < 0)
                                 goto finish;
                         if (ima_setup() < 0)
                                 goto finish;
-                        if (smack_setup(&loaded_policy) < 0)
+                        if (mac_smack_setup(&loaded_policy) < 0)
                                 goto finish;
                         dual_timestamp_get(&security_finish_timestamp);
                 }
@@ -1402,9 +1402,11 @@ int main(int argc, char *argv[]) {
         if (parse_config_file() < 0)
                 goto finish;
 
-        if (arg_running_as == SYSTEMD_SYSTEM)
-                if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
-                        goto finish;
+        if (arg_running_as == SYSTEMD_SYSTEM) {
+                r = parse_proc_cmdline(parse_proc_cmdline_item);
+                if (r < 0)
+                        log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
+        }
 
         /* Note that this also parses bits from the kernel command
          * line, including "debug". */