X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=bb7364054e3942224f1424720be3231a33de91b7;hb=9749cd77bc6121a304a7f1eb0f03f26e620dc9da;hp=ab2ac00d7636906ec95ecc6bd4c4aeed9812e5d5;hpb=a6b26d9011de60e1c41f51e8d2aab1d2f7bbf0f5;p=elogind.git

diff --git a/src/core/main.c b/src/core/main.c
index ab2ac00d7..bb7364054 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -410,6 +410,8 @@ static int parse_proc_cmdline_word(const char *word) {
 
         } else if (streq(word, "quiet"))
                 arg_show_status = false;
+        else if (streq(word, "debug"))
+                log_set_max_level(LOG_DEBUG);
         else if (!in_initrd()) {
                 unsigned i;
 
@@ -667,7 +669,7 @@ static int parse_config_file(void) {
         const char *fn;
         int r;
 
-        fn = arg_running_as == SYSTEMD_SYSTEM ? SYSTEM_CONFIG_FILE : USER_CONFIG_FILE;
+        fn = arg_running_as == SYSTEMD_SYSTEM ? PKGSYSCONFDIR "/system.conf" : PKGSYSCONFDIR "/user.conf";
         f = fopen(fn, "re");
         if (!f) {
                 if (errno == ENOENT)
@@ -677,7 +679,7 @@ static int parse_config_file(void) {
                 return 0;
         }
 
-        r = config_parse(NULL, fn, f, "Manager\0", config_item_table_lookup, (void*) items, false, NULL);
+        r = config_parse(NULL, fn, f, "Manager\0", config_item_table_lookup, (void*) items, false, false, NULL);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 
@@ -1236,6 +1238,8 @@ int main(int argc, char *argv[]) {
         bool reexecute = false;
         const char *shutdown_verb = NULL;
         dual_timestamp initrd_timestamp = { 0ULL, 0ULL };
+        dual_timestamp userspace_timestamp = { 0ULL, 0ULL };
+        dual_timestamp kernel_timestamp = { 0ULL, 0ULL };
         static char systemd[] = "systemd";
         bool skip_setup = false;
         int j;
@@ -1257,6 +1261,9 @@ int main(int argc, char *argv[]) {
         }
 #endif
 
+        dual_timestamp_from_monotonic(&kernel_timestamp, 0);
+        dual_timestamp_get(&userspace_timestamp);
+
         /* Determine if this is a reexecution or normal bootup. We do
          * the full command line parsing much later, so let's just
          * have a quick peek here. */
@@ -1291,7 +1298,7 @@ int main(int argc, char *argv[]) {
                 if (in_initrd()) {
                         char *rd_timestamp = NULL;
 
-                        dual_timestamp_get(&initrd_timestamp);
+                        initrd_timestamp = userspace_timestamp;
                         asprintf(&rd_timestamp, "%llu %llu",
                                  (unsigned long long) initrd_timestamp.realtime,
                                  (unsigned long long) initrd_timestamp.monotonic);
@@ -1351,7 +1358,6 @@ int main(int argc, char *argv[]) {
                 log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
 
         } else if (getpid() == 1) {
-
                 /* Running inside a container, as PID 1 */
                 arg_running_as = SYSTEMD_SYSTEM;
                 log_set_target(LOG_TARGET_CONSOLE);
@@ -1360,12 +1366,21 @@ int main(int argc, char *argv[]) {
                 /* For the later on, see above... */
                 log_set_target(LOG_TARGET_JOURNAL);
 
-        } else {
+                /* clear the kernel timestamp,
+                 * because we are in a container */
+                kernel_timestamp.monotonic = 0ULL;
+                kernel_timestamp.realtime = 0ULL;
 
+        } else {
                 /* Running as user instance */
                 arg_running_as = SYSTEMD_USER;
                 log_set_target(LOG_TARGET_AUTO);
                 log_open();
+
+                /* clear the kernel timestamp,
+                 * because we are not PID 1 */
+                kernel_timestamp.monotonic = 0ULL;
+                kernel_timestamp.realtime = 0ULL;
         }
 
         /* Initialize default unit */
@@ -1607,12 +1622,12 @@ int main(int argc, char *argv[]) {
         m->default_std_error = arg_default_std_error;
         m->runtime_watchdog = arg_runtime_watchdog;
         m->shutdown_watchdog = arg_shutdown_watchdog;
+        m->userspace_timestamp = userspace_timestamp;
+        m->kernel_timestamp = kernel_timestamp;
+        m->initrd_timestamp = initrd_timestamp;
 
         manager_set_default_rlimits(m, arg_default_rlimit);
 
-        if (dual_timestamp_is_set(&initrd_timestamp))
-                m->initrd_timestamp = initrd_timestamp;
-
         if (arg_default_controllers)
                 manager_set_default_controllers(m, arg_default_controllers);