diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-02-13 23:07:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-02-13 23:08:25 +0100 |
| commit | b872e9a05939bc3e0ac95a042592506a7488dd6f (patch) | |
| tree | 53a2f851a45ab77af7c1893f50a1d706f37584f5 /src | |
| parent | build-sys: make PolicyKit support compile-time optional (was runtime-optional... (diff) | |
| download | systemd-b872e9a05939bc3e0ac95a042592506a7488dd6f.tar.xz systemd-b872e9a05939bc3e0ac95a042592506a7488dd6f.zip | |
build-sys: make EFI support build-time optional
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/core/mount-setup.c | 2 | ||||
| -rw-r--r-- | src/shared/efivars.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index bd49892cd4..28f169daab 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -309,7 +309,9 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) { dual_timestamp_get(&m->userspace_timestamp); dual_timestamp_from_monotonic(&m->kernel_timestamp, 0); +#ifdef ENABLE_EFI efi_get_boot_timestamps(&m->userspace_timestamp, &m->firmware_timestamp, &m->loader_timestamp); +#endif m->running_as = running_as; m->name_data_slot = m->conn_data_slot = m->subscribed_data_slot = -1; diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 2cd0b60ba7..e7e2736615 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -77,8 +77,10 @@ static const MountPoint mount_table[] = { NULL, MNT_FATAL|MNT_IN_CONTAINER }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL, MNT_NONE }, +#ifdef ENABLE_EFI { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, is_efi_boot, MNT_NONE }, +#endif { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, NULL, MNT_FATAL|MNT_IN_CONTAINER }, { "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, diff --git a/src/shared/efivars.c b/src/shared/efivars.c index 840e4e0c35..8494f37729 100644 --- a/src/shared/efivars.c +++ b/src/shared/efivars.c @@ -28,6 +28,8 @@ #include "utf8.h" #include "efivars.h" +#ifdef ENABLE_EFI + bool is_efi_boot(void) { return access("/sys/firmware/efi", F_OK) >= 0; } @@ -469,3 +471,5 @@ int efi_get_loader_device_part_uuid(sd_id128_t *u) { return 0; } + +#endif |