diff options
| author | Zachary Cook <zachcook1991@gmail.com> | 2013-05-13 18:00:37 -0400 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2013-05-29 15:36:05 +0200 |
| commit | 4f8d551ff0177df87fae6cb970471186a422d064 (patch) | |
| tree | 5e6be315cf637c11b338a89913bc7685661cfdc5 /src/core/main.c | |
| parent | 832d16a616597f8b29645445f8be4284ee7ae1c0 (diff) | |
systemd: record efi timestamps after /sys is mounted
This partially reverts commit c3a170f3, which moved
efi_get_boot_timestamps too early in main(), before
/sys is assured to be mounted
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64371
[tomegun: in particular /sys/firmware/efi/efivars needs to be
mounted, which is not a problem if a systemd-initramfs containing
the correct module is being used. But not everyone uses an
initramfs...]
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/core/main.c b/src/core/main.c index 7fc06bea05..bf1e3e8ffa 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -69,7 +69,6 @@ #include "ima-setup.h" #include "fileio.h" #include "smack-setup.h" -#include "efivars.h" static enum { ACTION_RUN, @@ -1239,8 +1238,6 @@ int main(int argc, char *argv[]) { dual_timestamp initrd_timestamp = { 0ULL, 0ULL }; dual_timestamp userspace_timestamp = { 0ULL, 0ULL }; dual_timestamp kernel_timestamp = { 0ULL, 0ULL }; - dual_timestamp firmware_timestamp = { 0ULL, 0ULL }; - dual_timestamp loader_timestamp = { 0ULL, 0ULL }; static char systemd[] = "systemd"; bool skip_setup = false; int j; @@ -1289,9 +1286,7 @@ int main(int argc, char *argv[]) { log_show_color(isatty(STDERR_FILENO) > 0); if (getpid() == 1 && detect_container(NULL) <= 0) { -#ifdef ENABLE_EFI - efi_get_boot_timestamps(&userspace_timestamp, &firmware_timestamp, &loader_timestamp); -#endif + /* Running outside of a container as PID 1 */ arg_running_as = SYSTEMD_SYSTEM; make_null_stdio(); @@ -1627,8 +1622,6 @@ int main(int argc, char *argv[]) { m->shutdown_watchdog = arg_shutdown_watchdog; m->userspace_timestamp = userspace_timestamp; m->kernel_timestamp = kernel_timestamp; - m->firmware_timestamp = firmware_timestamp; - m->loader_timestamp = loader_timestamp; m->initrd_timestamp = initrd_timestamp; manager_set_default_rlimits(m, arg_default_rlimit); |