[systemd-commits] 3 commits - .gitignore Makefile.am src/bootchart src/core src/efi-boot-generator src/shared
Lennart Poettering
lennart at kemper.freedesktop.org
Sun Jan 20 16:04:30 PST 2013
.gitignore | 1
Makefile.am | 11 ++
src/bootchart/Makefile | 1
src/core/mount-setup.c | 1
src/efi-boot-generator/Makefile | 1
src/efi-boot-generator/efi-boot-generator.c | 117 ++++++++++++++++++++++++++++
src/shared/efivars.c | 34 ++++++++
src/shared/efivars.h | 7 +
src/shared/util.c | 4
src/shared/util.h | 2
10 files changed, 172 insertions(+), 7 deletions(-)
New commits:
commit 382e77287c6f4d122395e8685274d2ee85aec3eb
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jan 21 01:04:05 2013 +0100
build-sys: add makefile to bootchart
diff --git a/src/bootchart/Makefile b/src/bootchart/Makefile
new file mode 120000
index 0000000..d0b0e8e
--- /dev/null
+++ b/src/bootchart/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
commit f4ce2b3e5ce93b83f14f8785e205ebb5a9b8c1df
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jan 21 01:02:53 2013 +0100
efi: add efi boot generator that automatically mounts the ESP to /boot
diff --git a/.gitignore b/.gitignore
index 23c1b59..03ed554 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
/systemd-cryptsetup-generator
/systemd-delta
/systemd-detect-virt
+/systemd-efi-boot-generator
/systemd-fsck
/systemd-fstab-generator
/systemd-getty-generator
diff --git a/Makefile.am b/Makefile.am
index 2631748..7d5bd5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,7 +219,8 @@ endif
systemgenerator_PROGRAMS = \
systemd-getty-generator \
systemd-fstab-generator \
- systemd-system-update-generator
+ systemd-system-update-generator \
+ systemd-efi-boot-generator
dist_bin_SCRIPTS = \
src/analyze/systemd-analyze
@@ -1546,6 +1547,14 @@ systemd_system_update_generator_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
+systemd_efi_boot_generator_SOURCES = \
+ src/efi-boot-generator/efi-boot-generator.c
+
+systemd_efi_boot_generator_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator/rc-local-generator.c
diff --git a/src/efi-boot-generator/Makefile b/src/efi-boot-generator/Makefile
new file mode 120000
index 0000000..d0b0e8e
--- /dev/null
+++ b/src/efi-boot-generator/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
new file mode 100644
index 0000000..ee6ec31
--- /dev/null
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -0,0 +1,117 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "efivars.h"
+#include "path-util.h"
+#include "util.h"
+
+static const char *arg_dest = NULL;
+
+int main(int argc, char *argv[]) {
+ int r = EXIT_SUCCESS;
+ sd_id128_t id;
+ _cleanup_free_ char *name = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+
+ if (argc > 1 && argc != 4) {
+ log_error("This program takes three or no arguments.");
+ return EXIT_FAILURE;
+ }
+
+ if (argc > 1)
+ arg_dest = argv[3];
+
+ log_set_target(LOG_TARGET_SAFE);
+ log_parse_environment();
+ log_open();
+
+ umask(0022);
+
+ if (!is_efiboot())
+ return EXIT_SUCCESS;
+
+ if (dir_is_empty("/boot") <= 0)
+ return EXIT_SUCCESS;
+
+ r = efi_get_loader_device_part_uuid(&id);
+ if (r == -ENOENT)
+ return EXIT_SUCCESS;
+ if (r < 0) {
+ log_error("Failed to read ESP partition UUID: %s", strerror(-r));
+ return EXIT_FAILURE;
+ }
+
+ name = strjoin(arg_dest, "/boot.mount", NULL);
+ if (!name) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
+
+ f = fopen(name, "wxe");
+ if (!f) {
+ log_error("Failed to create mount unit file %s: %m", name);
+ return EXIT_FAILURE;
+ }
+
+ fprintf(f,
+ "# Automatially generated by systemd-efi-boot-generator\n\n"
+ "[Mount]\n"
+ "Where=/boot\n"
+ "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
+ "Options=umask=0077\n",
+ SD_ID128_FORMAT_VAL(id));
+
+ free(name);
+ name = strjoin(arg_dest, "/boot.automount", NULL);
+ if (!name) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
+
+ fclose(f);
+ f = fopen(name, "wxe");
+ if (!f) {
+ log_error("Failed to create automount unit file %s: %m", name);
+ return EXIT_FAILURE;
+ }
+
+ fprintf(f,
+ "# Automatially generated by systemd-efi-boot-generator\n\n"
+ "[Automount]\n"
+ "Where=/boot\n");
+
+ free(name);
+ name = strjoin(arg_dest, "/local-fs.target.wants/boot.automount", NULL);
+ if (!name) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
+
+ if (symlink("../boot.automount", name) < 0) {
+ log_error("Failed to create symlink: %m");
+ return EXIT_FAILURE;
+ }
+
+ return 0;
+}
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 784ff36..183d33c 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -235,3 +235,33 @@ int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, d
return 0;
}
+
+int efi_get_loader_device_part_uuid(sd_id128_t *u) {
+ _cleanup_free_ void *s = NULL;
+ _cleanup_free_ char *p = NULL;
+ size_t ss;
+ int r, parsed[16];
+ unsigned i;
+
+ assert(u);
+
+ r = efi_get_variable(EFI_VENDOR_LOADER, "LoaderDevicePartUUID", NULL, &s, &ss);
+ if (r < 0)
+ return r;
+
+ p = utf16_to_utf8(s, ss);
+ if (!p)
+ return -ENOMEM;
+
+ if (sscanf(p, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+ &parsed[0], &parsed[1], &parsed[2], &parsed[3],
+ &parsed[4], &parsed[5], &parsed[6], &parsed[7],
+ &parsed[8], &parsed[9], &parsed[10], &parsed[11],
+ &parsed[12], &parsed[13], &parsed[14], &parsed[15]) != 16)
+ return -EIO;
+
+ for (i = 0; i < ELEMENTSOF(parsed); i++)
+ u->bytes[i] = parsed[i];
+
+ return 0;
+}
diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 120f3c7..d5cfb4f 100644
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -23,11 +23,15 @@
#include <sys/types.h>
#include <inttypes.h>
+#include <stdbool.h>
#include "sd-id128.h"
+#include "time-util.h"
bool is_efiboot(void);
int efi_get_variable(sd_id128_t vendor, const char *name, uint32_t *attribute, void **value, size_t *size);
int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);
+
+int efi_get_loader_device_part_uuid(sd_id128_t *u);
commit 34e5a31ec5897de8ba1436dad53df99637569d0a
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat Jan 19 04:41:33 2013 +0100
util: move is_efiboot() to efivars.c
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 98614d0..5b32474 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -41,6 +41,7 @@
#include "path-util.h"
#include "missing.h"
#include "virt.h"
+#include "efivars.h"
#ifndef TTY_GID
#define TTY_GID 5
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 3bd47b8..784ff36 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -28,6 +28,10 @@
#define EFI_VENDOR_LOADER SD_ID128_MAKE(4a,67,b0,82,0a,4c,41,cf,b6,c7,44,0b,29,bb,8c,4f)
+bool is_efiboot(void) {
+ return access("/sys/firmware/efi", F_OK) >= 0;
+}
+
int efi_get_variable(sd_id128_t vendor, const char *name, uint32_t *attribute, void **value, size_t *size) {
_cleanup_close_ int fd = -1;
_cleanup_free_ char *p = NULL;
diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 7b65c92..120f3c7 100644
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -26,5 +26,8 @@
#include "sd-id128.h"
+bool is_efiboot(void);
+
int efi_get_variable(sd_id128_t vendor, const char *name, uint32_t *attribute, void **value, size_t *size);
+
int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);
diff --git a/src/shared/util.c b/src/shared/util.c
index 1aaebf0..490399c 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -77,10 +77,6 @@ char **saved_argv = NULL;
static volatile unsigned cached_columns = 0;
static volatile unsigned cached_lines = 0;
-bool is_efiboot(void) {
- return access("/sys/firmware/efi", F_OK) >= 0;
-}
-
size_t page_size(void) {
static __thread size_t pgsz = 0;
long r;
diff --git a/src/shared/util.h b/src/shared/util.h
index d260385..202e15d 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -60,8 +60,6 @@ union dirent_storage {
#define ANSI_HIGHLIGHT_YELLOW_ON "\x1B[1;33m"
#define ANSI_HIGHLIGHT_OFF "\x1B[0m"
-bool is_efiboot(void);
-
size_t page_size(void);
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
More information about the systemd-commits
mailing list