udev: support ENV{}=="" global property matches

[elogind.git] / src / core / main.c

diff --git a/src/core/main.c b/src/core/main.c
index 0388f46c36197e22cbfd9ccbd33d03dd69ebf3de..56a1f6193c974d2316fd93b784b7bf7768e166e2 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -116,9 +116,6 @@ static FILE* arg_serialization = NULL;
 static bool arg_default_cpu_accounting = false;
 static bool arg_default_blockio_accounting = false;
 static bool arg_default_memory_accounting = false;
 static bool arg_default_cpu_accounting = false;
 static bool arg_default_blockio_accounting = false;
 static bool arg_default_memory_accounting = false;

-static usec_t arg_start_timeout_usec = DEFAULT_MANAGER_START_TIMEOUT_USEC;
-static FailureAction arg_start_timeout_action = FAILURE_ACTION_POWEROFF_FORCE;
-static char *arg_start_timeout_reboot_arg = NULL;

 
 static void nop_handler(int sig) {}
 
 
 static void nop_handler(int sig) {}
 


@@ -673,9 +670,6 @@ static int parse_config_file(void) {
                 { "Manager", "DefaultCPUAccounting",      config_parse_bool,             0, &arg_default_cpu_accounting            },
                 { "Manager", "DefaultBlockIOAccounting",  config_parse_bool,             0, &arg_default_blockio_accounting        },
                 { "Manager", "DefaultMemoryAccounting",   config_parse_bool,             0, &arg_default_memory_accounting         },
                 { "Manager", "DefaultCPUAccounting",      config_parse_bool,             0, &arg_default_cpu_accounting            },
                 { "Manager", "DefaultBlockIOAccounting",  config_parse_bool,             0, &arg_default_blockio_accounting        },
                 { "Manager", "DefaultMemoryAccounting",   config_parse_bool,             0, &arg_default_memory_accounting         },

-                { "Manager", "StartTimeoutSec",           config_parse_sec,              0, &arg_start_timeout_usec                },
-                { "Manager", "StartTimeoutAction",        config_parse_failure_action,   0, &arg_start_timeout_action              },
-                { "Manager", "StartTimeoutRebootArgument",config_parse_string,           0, &arg_start_timeout_reboot_arg          },

                 {}
         };
 
                 {}
         };
 


@@ -1299,16 +1293,16 @@ int main(int argc, char *argv[]) {
                 if (!skip_setup) {
                         mount_setup_early();
                         dual_timestamp_get(&security_start_timestamp);
                 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;
                                 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);
                 }
 
                                 goto finish;
                         dual_timestamp_get(&security_finish_timestamp);
                 }
 

-                if (label_init(NULL) < 0)
+                if (mac_selinux_init(NULL) < 0)

                         goto finish;
 
                 if (!skip_setup) {
                         goto finish;
 
                 if (!skip_setup) {


@@ -1408,9 +1402,11 @@ int main(int argc, char *argv[]) {
         if (parse_config_file() < 0)
                 goto finish;
 
         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". */
 
         /* Note that this also parses bits from the kernel command
          * line, including "debug". */


@@ -1635,9 +1631,6 @@ int main(int argc, char *argv[]) {
         m->default_memory_accounting = arg_default_memory_accounting;
         m->runtime_watchdog = arg_runtime_watchdog;
         m->shutdown_watchdog = arg_shutdown_watchdog;
         m->default_memory_accounting = arg_default_memory_accounting;
         m->runtime_watchdog = arg_runtime_watchdog;
         m->shutdown_watchdog = arg_shutdown_watchdog;

-        m->start_timeout_usec = arg_start_timeout_usec;
-        m->start_timeout_action = arg_start_timeout_action;
-        free_and_strdup(&m->start_timeout_reboot_arg, arg_start_timeout_reboot_arg);

 
         m->userspace_timestamp = userspace_timestamp;
         m->kernel_timestamp = kernel_timestamp;
 
         m->userspace_timestamp = userspace_timestamp;
         m->kernel_timestamp = kernel_timestamp;


@@ -1827,10 +1820,7 @@ finish:
         set_free(arg_syscall_archs);
         arg_syscall_archs = NULL;
 
         set_free(arg_syscall_archs);
         arg_syscall_archs = NULL;
 

-        free(arg_start_timeout_reboot_arg);
-        arg_start_timeout_reboot_arg = NULL;
-
-        label_finish();
+        mac_selinux_finish();

 
         if (reexecute) {
                 const char **args;
 
         if (reexecute) {
                 const char **args;