clearlinux/clr-boot-manager
2
0
Fork 0
mirror of https://github.com/clearlinux/clr-boot-manager.git synced 2026-10-03 23:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add stub shim-systemd support.

Browse Source 
Does nothing at this point.
This commit is contained in:
Arzhan Kinzhalin
2017-09-19 18:49:02 +00:00
parent 9bdd68d4c5
commit 4837aef7f9
4 changed files with 169 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+1
View File
@@ -93,6 +93,7 @@ libcbm_la_SOURCES = \
src/bootloaders/bootloader.h \
src/bootloaders/systemd-class.h \
src/bootloaders/systemd-class.c \
src/bootloaders/shim-systemd.c \
src/bootloaders/systemd-boot.c \
src/bootloaders/grub2.c \
src/bootloaders/gummiboot.c \
configure.ac
+12 -4
View File
@@ -42,7 +42,11 @@ AC_ARG_WITH([bootloader], AS_HELP_STRING([--with-bootloader=BOOTLOADER],
if test x$bootloader = "xauto"; then
AC_MSG_CHECKING([whether an EFI bootloader is available])
if test -e "/usr/lib/systemd/boot/efi"; then
bootloader="systemd-boot"
if test -e "/usr/lib/shim"; then
bootloader="shim-systemd-boot"
else
bootloader="systemd-boot"
fi
elif test -e "/usr/lib/goofiboot"; then
bootloader="goofiboot"
# use newer goofiboot, may be dual installed
@@ -50,13 +54,16 @@ if test x$bootloader = "xauto"; then
bootloader="gummiboot"
else
AC_MSG_WARN([Cannot find a valid EFI bootloader, defaulting to systemd-boot])
bootloader="systemd-boot"
bootloader="shim-systemd-boot"
fi
AC_MSG_RESULT([$bootloader])
fi
# Now test the option
if test x$bootloader = "xsystemd-boot"; then
if test x$bootloader = "xshim-systemd-boot"; then
have_shim_systemdboot="yes"
AC_DEFINE([HAVE_SHIM_SYSTEMD_BOOT], [1], [Using shim-systemd-boot])
elif test x$bootloader = "xsystemd-boot"; then
have_systemdboot="yes"
AC_DEFINE([HAVE_SYSTEMD_BOOT], [1], [Using systemd-boot])
elif test x$bootloader = "xgummiboot"; then
@@ -66,9 +73,10 @@ elif test x$bootloader = "xgoofiboot"; then
have_goofiboot="yes"
AC_DEFINE([HAVE_GOOFIBOOT], [1], [Using goofiboot])
else
AC_MSG_ERROR([Unknown bootloader, use: systemd-boot, gummiboot, or goofiboot])
AC_MSG_ERROR([Unknown bootloader, use: shim-systemd-boot, systemd-boot, gummiboot, or goofiboot])
fi
AM_CONDITIONAL([HAVE_SHIM_SYSTEMD_BOOT], [test x$have_shim_systemdboot = "xyes"])
AM_CONDITIONAL([HAVE_SYSTEMD_BOOT], [test x$have_systemdboot = "xyes"])
AM_CONDITIONAL([HAVE_GUMMIBOOT], [test x$have_gummiboot = "xyes"])
AM_CONDITIONAL([HAVE_GOOFIBOOT], [test x$have_goofiboot = "xyes"])
src/bootloaders/shim-systemd.c
+152
View File
@@ -0,0 +1,152 @@
/*
* This file is part of clr-boot-manager.
*
* Copyright © 2016-2017 Intel Corporation
*
* clr-boot-manager 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.
*/
#define _GNU_SOURCE
#include "bootman.h"
#include "bootloader.h"
#include "config.h"
/*
* This file implements 2-stage bootloader configuration in which shim is used as
* the first stage bootloader and systemd-boot as the second stage bootloader.
*
* This implementation uses the following ESP layout:
*
* /EFI/
* Boot/
* BOOTX64.EFI <-- whatever was there before
*
* /org.clearlinux/
* bootloaderx64.efi <-- shim
* loaderx64.efi <-- systemd-boot bootloader
* mmx64.efi <-- MOK mgr
* fbx64.efi <-- MOK mgr
*
* kernel/ <-- kernels
* kernel-org.clearlinux.....
* ...
*
* /loader/ <-- systemd-boot config
* entries/ <-- boot menu entries
* Clear-linux...conf
* ...
* loader.conf <-- bootloader config
*
* Note that default bootloader at /EFI/Boot/BOOTX64.EFI is never modified.
* Instead, we create an EFI BootXXX variable and put it first in the BootOrder
* EFI variable.
*/
static bool _shim_systemd_install_kernel(const BootManager *manager, const Kernel *kernel);
static bool _shim_systemd_remove_kernel(const BootManager *manager, const Kernel *kernel);
static bool _shim_systemd_set_default_kernel(const BootManager *manager, const Kernel *kernel);
static bool _shim_systemd_needs_install(const BootManager *manager);
static bool _shim_systemd_needs_update(const BootManager *manager);
static bool _shim_systemd_install(const BootManager *manager);
static bool _shim_systemd_update(const BootManager *manager);
static bool _shim_systemd_remove(const BootManager *manager);
static bool _shim_systemd_init(const BootManager *manager);
static void _shim_systemd_destroy(const BootManager *manager);
static int _shim_systemd_get_capabilities(const BootManager *manager);
__cbm_export__ const BootLoader shim_systemd_bootloader = {
.name = "systemd",
.init = _shim_systemd_init,
.install_kernel = _shim_systemd_install_kernel,
.remove_kernel = _shim_systemd_remove_kernel,
.set_default_kernel = _shim_systemd_set_default_kernel,
.needs_install = _shim_systemd_needs_install,
.needs_update = _shim_systemd_needs_update,
.install = _shim_systemd_install,
.update = _shim_systemd_update,
.remove = _shim_systemd_remove,
.destroy = _shim_systemd_destroy,
.get_capabilities = _shim_systemd_get_capabilities
};
#if UINTPTR_MAX == 0xffffffffffffffff
# define EFI_SUFFIX "x64.efi"
#else
# define EFI_SUFFIX "ia32.efi"
#endif
/* Layout entries, see the layout description at the top of the file. */
#define SHIM_SRC_DIR "/usr/lib/shim"
#define SHIM_SRC SHIM_SRC_DIR "/" "shim" EFI_SUFFIX
#define MM_SRC SHIM_SRC_DIR "/" "mm" EFI_SUFFIX
#define FB_SRC SHIM_SRC_DIR "/" "fb" EFI_SUFFIX
#define SYSTEMD_SRC_DIR "/usr/lib/systemd/boot/efi"
#define SYSTEMD_SRC SYSTEMD "/" "systemd-boot" EFI_SUFFIX
#define DST_DIR BOOT_DIRECTORY "/" KERNEL_NAMESPACE
#define SHIM_DST DST_DIR "/" "bootloader" EFI_SUFFIX
#define SYSTEMD_DST DST_DIR "/" "loader" EFI_SUFFIX
#define KERNEL_DST_DIR DST_DIR "/kernel"
#define SYSTEMD_CONFIG_DIR BOOT_DIRECTORY "/loader"
#define SYSTEMD_CONFIG SYSTEMD_CONFIG_DIR "/loader.conf"
#define SYSTEMD_ENTRIES SYSTEMD_CONFIG_DIR "/entries"
static bool _shim_systemd_install_kernel(const BootManager *manager, const Kernel *kernel) {
return true;
}
static bool _shim_systemd_remove_kernel(const BootManager *manager, const Kernel *kernel) {
return true;
}
static bool _shim_systemd_set_default_kernel(const BootManager *manager, const Kernel *kernel) {
return true;
}
static bool _shim_systemd_needs_install(const BootManager *manager) {
return true;
}
static bool _shim_systemd_needs_update(const BootManager *manager) {
return true;
}
static bool _shim_systemd_install(const BootManager *manager) {
return true;
}
static bool _shim_systemd_update(const BootManager *manager) {
return true;
}
static bool _shim_systemd_remove(const BootManager *manager) {
return true;
}
static bool _shim_systemd_init(const BootManager *manager) {
return true;
}
static void _shim_systemd_destroy(const BootManager *manager) {
return true;
}
static int _shim_systemd_get_capabilities(const BootManager *manager) {
return 0;
}
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=8 tabstop=8 expandtab:
* :indentSize=8:tabSize=8:noTabs=true:
*/
src/bootman/bootman.c
+4 -1
View File
@@ -31,6 +31,7 @@
* Total "usable" bootloaders
*/
extern const BootLoader grub2_bootloader;
extern const BootLoader shim_systemd_bootloader;
extern const BootLoader systemd_bootloader;
extern const BootLoader gummiboot_bootloader;
extern const BootLoader goofiboot_bootloader;
@@ -41,7 +42,9 @@ extern const BootLoader syslinux_bootloader;
*/
const BootLoader *bootman_known_loaders[] =
{ &grub2_bootloader, /**<Always place first to allow syslinux to override */
#if defined(HAVE_SYSTEMD_BOOT)
#if defined(HAVE_SHIM_SYSTEMD_BOOT)
&shim_systemd_bootloader,
#elif defined(HAVE_SYSTEMD_BOOT)
&systemd_bootloader,
#elif defined(HAVE_GUMMIBOOT)
&gummiboot_bootloader,