Add support for grub-emu to kexec Linux menu entries
RFC PATCH 1/1 Add support for grub-emu to kexec Linux menu entries
From: John Jolly <[email protected]>
The GRUB emulator is used as a debugging utility but it could also be used as a user-space bootloader if there is support to boot an operating system.
The Linux kernel is already able to (re)boot another kernel via the kexec boot mechanism. So the grub-emu tool could rely on this feature and have linux and initrd commands that are used to pass a kernel, initramfs image and command line parameters to kexec for booting a selected menu entry.
By default the systemctl kexec option is used so systemd can shutdown all of the running services before doing a reboot using kexec. But if this is not present, it fallbacks to executing the kexec user-space tool directly.
---
Hello,
This patch has been in the SUSE grub2 package for some time and we have also included in the Fedora grub2 package now. I'm posting it as an RFC because I think that will need some discussions before being able to merge this patch.
Best regards,
Javier
grub-core/Makefile.am | 1 + grub-core/Makefile.core.def | 2 +- grub-core/kern/emu/main.c | 4 + grub-core/kern/emu/misc.c | 18 +++- grub-core/loader/emu/linux.c | 182 +++++++++++++++++++++++++++++++++++ include/grub/emu/exec.h | 4 +- include/grub/emu/hostfile.h | 3 +- include/grub/emu/misc.h | 3 + 8 files changed, 213 insertions(+), 4 deletions(-) create mode 100644 grub-core/loader/emu/linux.c
grub-core/Makefile.am +1 -0
@@ -303,6 +303,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostdisk.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostfile.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/exec.h if COND_GRUB_EMU_SDL KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h endif
grub-core/Makefile.core.def +1 -1
@@ -1801,9 +1801,9 @@ module = { arm64 = loader/arm64/linux.c; riscv32 = loader/riscv/linux.c; riscv64 = loader/riscv/linux.c; + emu = loader/emu/linux.c; common = loader/linux.c; common = lib/cmdline.c; - enable = noemu; }; module = {
grub-core/kern/emu/main.c +4 -0
@@ -107,6 +107,7 @@ static struct argp_option options[] = { N_("use GRUB files in the directory DIR [default=%s]"), 0}, {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, {"hold", 'H', N_("SECS"), OPTION_ARG_OPTIONAL, N_("wait until a debugger will attach"), 0}, + {"kexec", 'X', 0, 0, N_("use kexec to boot Linux kernels."), 0}, { 0, 0, 0, 0, 0, 0 } };
@@ -164,6 +165,9 @@ argp_parser (int key, char *arg, struct argp_state *state)case 'v' : verbosity++;break ; +case 'X' : +grub_util_set_kexecute (); +break ;case ARGP_KEY_ARG : {
grub-core/kern/emu/misc.c +17 -1
@@ -39,6 +39,7 @@#include <grub/emu/misc.h> int verbosity; +int kexecute;void grub_util_warn (const char *fmt, ...)
@@ -82,7 +83,7 @@ grub_util_error (const char *fmt, ...)vfprintf (stderr, fmt, ap);va_end (ap);fprintf (stderr,".\n" ); -exit (1 ); +grub_exit (); } void *
@@ -141,6 +142,9 @@ xasprintf (const char *fmt, ...)void grub_exit (void ) { +#if defined (GRUB_KERNEL ) +grub_reboot (); +#endif exit (1 ); }#endif
@@ -202,3 +206,15 @@ grub_util_load_image (const char *path, char *buf)fclose (fp); } + +void +grub_util_set_kexecute (void ) +{ + kexecute++; +} + +int +grub_util_get_kexecute (void ) +{ +return kexecute; +}
grub-core/loader/emu/linux.c new file +182 -0
182 lines not on this page · raw message
include/grub/emu/exec.h +3 -1
@@ -23,6 +23,8 @@#include <stdarg.h> #include <sys/types.h> +#include <grub/symbol.h> +pid_t grub_util_exec_pipe (const char *const *argv,int *fd); pid_t
@@ -32,7 +34,7 @@ int grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file, const char *stdout_file, const char *stderr_file);int -grub_util_exec (const char *const *argv); +EXPORT_FUNC (grub_util_exec ) (const char *const *argv);int grub_util_exec_redirect (const char *const *argv,const char *stdin_file,const char *stdout_file);
include/grub/emu/hostfile.h +2 -1
@@ -22,6 +22,7 @@#include <grub/disk.h> #include <grub/partition.h> #include <sys/types.h> +#include <grub/symbol.h> #include <grub/osdep/hostfile.h> int
@@ -29,7 +30,7 @@ grub_util_is_directory (const char *path);int grub_util_is_special_file (const char *path);int -grub_util_is_regular (const char *path); +EXPORT_FUNC (grub_util_is_regular ) (const char *path);char *grub_util_path_concat (size_t n, ...);
include/grub/emu/misc.h +3 -0
@@ -56,6 +56,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (void EXPORT_FUNC (grub_util_info ) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF ,1 ,2 )));void EXPORT_FUNC (grub_util_error ) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF ,1 ,2 ), noreturn)); +void EXPORT_FUNC (grub_util_set_kexecute ) (void ); +int EXPORT_FUNC(grub_util_get_kexecute) (void) WARN_UNUSED_RESULT; +grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms ) (void );#ifdef HAVE_DEVICE_MAPPER
Signature · 1 line
2.21.0