CentOS Sources
2 years ago
committed by
MSVSphere Packaging Team
commit
6d28912ce4
@ -0,0 +1,4 @@
|
|||||||
|
SOURCES/gnulib-fixes.tar.gz
|
||||||
|
SOURCES/grub-2.06.tar.xz
|
||||||
|
SOURCES/theme.tar.bz2
|
||||||
|
SOURCES/unifont-13.0.06.pcf.gz
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
1a07692dfaa916675a92b1383885141f490f98d2 SOURCES/gnulib-fixes.tar.gz
|
||||||
|
c9f93f1e195ec7a5a21d36a13b469788c0b29f0f SOURCES/grub-2.06.tar.xz
|
||||||
|
cf0b7763c528902da7e8b05cfa248f20c8825ce5 SOURCES/theme.tar.bz2
|
||||||
|
3b39cb0830367171760ec536cab805abdbe08bc5 SOURCES/unifont-13.0.06.pcf.gz
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Fri, 11 Jun 2021 12:10:45 +0200
|
||||||
|
Subject: [PATCH] Revert "templates: Fix user-facing typo with an incorrect use
|
||||||
|
of "it's""
|
||||||
|
|
||||||
|
This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821.
|
||||||
|
---
|
||||||
|
util/grub.d/30_os-prober.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
||||||
|
index 5984e92d291..94622481284 100644
|
||||||
|
--- a/util/grub.d/30_os-prober.in
|
||||||
|
+++ b/util/grub.d/30_os-prober.in
|
||||||
|
@@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
-grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIts output will be used to detect bootable binaries on them and create new boot entries.")"
|
||||||
|
+grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
|
||||||
|
|
||||||
|
OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
|
||||||
|
if [ -z "${OSPROBED}" ] ; then
|
||||||
@ -0,0 +1,71 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Fri, 11 Jun 2021 12:10:54 +0200
|
||||||
|
Subject: [PATCH] Revert "templates: Properly disable the os-prober by default"
|
||||||
|
|
||||||
|
This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
|
||||||
|
---
|
||||||
|
util/grub-mkconfig.in | 5 +----
|
||||||
|
util/grub.d/30_os-prober.in | 8 ++++----
|
||||||
|
2 files changed, 5 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index f8cbb8d7a2b..d3e879b8e5c 100644
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2
|
||||||
|
GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
|
||||||
|
GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
|
||||||
|
|
||||||
|
-# Disable os-prober by default due to security reasons.
|
||||||
|
-GRUB_DISABLE_OS_PROBER="true"
|
||||||
|
-
|
||||||
|
# Filesystem for the device containing our userland. Used for stuff like
|
||||||
|
# choosing Hurd filesystem module.
|
||||||
|
GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
|
||||||
|
@@ -204,7 +201,6 @@ export GRUB_DEVICE \
|
||||||
|
GRUB_DEVICE_PARTUUID \
|
||||||
|
GRUB_DEVICE_BOOT \
|
||||||
|
GRUB_DEVICE_BOOT_UUID \
|
||||||
|
- GRUB_DISABLE_OS_PROBER \
|
||||||
|
GRUB_FS \
|
||||||
|
GRUB_FONT \
|
||||||
|
GRUB_PRELOAD_MODULES \
|
||||||
|
@@ -246,6 +242,7 @@ export GRUB_DEFAULT \
|
||||||
|
GRUB_BACKGROUND \
|
||||||
|
GRUB_THEME \
|
||||||
|
GRUB_GFXPAYLOAD_LINUX \
|
||||||
|
+ GRUB_DISABLE_OS_PROBER \
|
||||||
|
GRUB_INIT_TUNE \
|
||||||
|
GRUB_SAVEDEFAULT \
|
||||||
|
GRUB_ENABLE_CRYPTODISK \
|
||||||
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
||||||
|
index 94622481284..80685b15f4d 100644
|
||||||
|
--- a/util/grub.d/30_os-prober.in
|
||||||
|
+++ b/util/grub.d/30_os-prober.in
|
||||||
|
@@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@"
|
||||||
|
|
||||||
|
. "$pkgdatadir/grub-mkconfig_lib"
|
||||||
|
|
||||||
|
-if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
|
||||||
|
- grub_warn "$(gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.")"
|
||||||
|
+if [ "x${GRUB_DISABLE_OS_PROBER}" = "xfalse" ]; then
|
||||||
|
+ gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.\n"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
@@ -36,12 +36,12 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
-grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
|
||||||
|
-
|
||||||
|
OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
|
||||||
|
if [ -z "${OSPROBED}" ] ; then
|
||||||
|
# empty os-prober output, nothing doing
|
||||||
|
exit 0
|
||||||
|
+else
|
||||||
|
+ grub_warn "$(gettext_printf "os-prober was executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
osx_entry() {
|
||||||
@ -0,0 +1,70 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Fri, 11 Jun 2021 12:10:58 +0200
|
||||||
|
Subject: [PATCH] Revert "templates: Disable the os-prober by default"
|
||||||
|
|
||||||
|
This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
|
||||||
|
---
|
||||||
|
docs/grub.texi | 18 ++++++++----------
|
||||||
|
util/grub.d/30_os-prober.in | 5 +----
|
||||||
|
2 files changed, 9 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/docs/grub.texi b/docs/grub.texi
|
||||||
|
index f8b4b3b21a7..69f08d289f9 100644
|
||||||
|
--- a/docs/grub.texi
|
||||||
|
+++ b/docs/grub.texi
|
||||||
|
@@ -1519,13 +1519,10 @@ boot sequence. If you have problems, set this option to @samp{text} and
|
||||||
|
GRUB will tell Linux to boot in normal text mode.
|
||||||
|
|
||||||
|
@item GRUB_DISABLE_OS_PROBER
|
||||||
|
-The @command{grub-mkconfig} has a feature to use the external
|
||||||
|
-@command{os-prober} program to discover other operating systems installed on
|
||||||
|
-the same machine and generate appropriate menu entries for them. It is disabled
|
||||||
|
-by default since automatic and silent execution of @command{os-prober}, and
|
||||||
|
-creating boot entries based on that data, is a potential attack vector. Set
|
||||||
|
-this option to @samp{false} to enable this feature in the
|
||||||
|
-@command{grub-mkconfig} command.
|
||||||
|
+Normally, @command{grub-mkconfig} will try to use the external
|
||||||
|
+@command{os-prober} program, if installed, to discover other operating
|
||||||
|
+systems installed on the same system and generate appropriate menu entries
|
||||||
|
+for them. Set this option to @samp{true} to disable this.
|
||||||
|
|
||||||
|
@item GRUB_OS_PROBER_SKIP_LIST
|
||||||
|
List of space-separated FS UUIDs of filesystems to be ignored from os-prober
|
||||||
|
@@ -1853,9 +1850,10 @@ than zero; otherwise 0.
|
||||||
|
@section Multi-boot manual config
|
||||||
|
|
||||||
|
Currently autogenerating config files for multi-boot environments depends on
|
||||||
|
-os-prober and has several shortcomings. Due to that it is disabled by default.
|
||||||
|
-It is advised to use the power of GRUB syntax and do it yourself. A possible
|
||||||
|
-configuration is detailed here, feel free to adjust to your needs.
|
||||||
|
+os-prober and has several shortcomings. While fixing it is scheduled for the
|
||||||
|
+next release, meanwhile you can make use of the power of GRUB syntax and do it
|
||||||
|
+yourself. A possible configuration is detailed here, feel free to adjust to your
|
||||||
|
+needs.
|
||||||
|
|
||||||
|
First create a separate GRUB partition, big enough to hold GRUB. Some of the
|
||||||
|
following entries show how to load OS installer images from this same partition,
|
||||||
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
||||||
|
index 80685b15f4d..1b91c102f35 100644
|
||||||
|
--- a/util/grub.d/30_os-prober.in
|
||||||
|
+++ b/util/grub.d/30_os-prober.in
|
||||||
|
@@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@"
|
||||||
|
|
||||||
|
. "$pkgdatadir/grub-mkconfig_lib"
|
||||||
|
|
||||||
|
-if [ "x${GRUB_DISABLE_OS_PROBER}" = "xfalse" ]; then
|
||||||
|
- gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.\n"
|
||||||
|
+if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
@@ -40,8 +39,6 @@ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
|
||||||
|
if [ -z "${OSPROBED}" ] ; then
|
||||||
|
# empty os-prober output, nothing doing
|
||||||
|
exit 0
|
||||||
|
-else
|
||||||
|
- grub_warn "$(gettext_printf "os-prober was executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
osx_entry() {
|
||||||
@ -0,0 +1,109 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matthew Garrett <mjg59@coreos.com>
|
||||||
|
Date: Sun, 9 Aug 2015 16:12:39 -0700
|
||||||
|
Subject: [PATCH] Rework linux command
|
||||||
|
|
||||||
|
We want a single buffer that contains the entire kernel image in order to
|
||||||
|
perform a TPM measurement. Allocate one and copy the entire kernel into it
|
||||||
|
before pulling out the individual blocks later on.
|
||||||
|
|
||||||
|
Signed-off-by: Matthew Garrett <mjg59@coreos.com>
|
||||||
|
---
|
||||||
|
grub-core/loader/i386/linux.c | 35 +++++++++++++++++++++++------------
|
||||||
|
1 file changed, 23 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
||||||
|
index 9f74a96b19a..dccf3bb3005 100644
|
||||||
|
--- a/grub-core/loader/i386/linux.c
|
||||||
|
+++ b/grub-core/loader/i386/linux.c
|
||||||
|
@@ -649,13 +649,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
{
|
||||||
|
grub_file_t file = 0;
|
||||||
|
struct linux_i386_kernel_header lh;
|
||||||
|
+ grub_uint8_t *linux_params_ptr;
|
||||||
|
grub_uint8_t setup_sects;
|
||||||
|
- grub_size_t real_size, prot_size, prot_file_size;
|
||||||
|
+ grub_size_t real_size, prot_size, prot_file_size, kernel_offset;
|
||||||
|
grub_ssize_t len;
|
||||||
|
int i;
|
||||||
|
grub_size_t align, min_align;
|
||||||
|
int relocatable;
|
||||||
|
grub_uint64_t preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
||||||
|
+ grub_uint8_t *kernel = NULL;
|
||||||
|
|
||||||
|
grub_dl_ref (my_mod);
|
||||||
|
|
||||||
|
@@ -669,7 +671,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
if (! file)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
- if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
|
||||||
|
+ len = grub_file_size (file);
|
||||||
|
+ kernel = grub_malloc (len);
|
||||||
|
+ if (!kernel)
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (grub_file_read (file, kernel, len) != len)
|
||||||
|
{
|
||||||
|
if (!grub_errno)
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||||
|
@@ -677,6 +687,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ grub_memcpy (&lh, kernel, sizeof (lh));
|
||||||
|
+ kernel_offset = sizeof (lh);
|
||||||
|
+
|
||||||
|
if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
|
||||||
|
@@ -784,13 +797,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
/* We've already read lh so there is no need to read it second time. */
|
||||||
|
len -= sizeof(lh);
|
||||||
|
|
||||||
|
- if ((len > 0) &&
|
||||||
|
- (grub_file_read (file, (char *) &linux_params + sizeof (lh), len) != len))
|
||||||
|
+ linux_params_ptr = (void *)&linux_params;
|
||||||
|
+ if (len > 0)
|
||||||
|
{
|
||||||
|
- if (!grub_errno)
|
||||||
|
- grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||||
|
- argv[0]);
|
||||||
|
- goto fail;
|
||||||
|
+ grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len);
|
||||||
|
+ kernel_offset += len;
|
||||||
|
}
|
||||||
|
|
||||||
|
linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR;
|
||||||
|
@@ -853,7 +864,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
|
||||||
|
/* The other parameters are filled when booting. */
|
||||||
|
|
||||||
|
- grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
|
||||||
|
+ kernel_offset = real_size + GRUB_DISK_SECTOR_SIZE;
|
||||||
|
|
||||||
|
grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
|
||||||
|
(unsigned) real_size, (unsigned) prot_size);
|
||||||
|
@@ -1007,9 +1018,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
}
|
||||||
|
|
||||||
|
len = prot_file_size;
|
||||||
|
- if (grub_file_read (file, prot_mode_mem, len) != len && !grub_errno)
|
||||||
|
- grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||||
|
- argv[0]);
|
||||||
|
+ grub_memcpy (prot_mode_mem, kernel + kernel_offset, len);
|
||||||
|
|
||||||
|
if (grub_errno == GRUB_ERR_NONE)
|
||||||
|
{
|
||||||
|
@@ -1020,6 +1029,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
|
||||||
|
fail:
|
||||||
|
|
||||||
|
+ grub_free (kernel);
|
||||||
|
+
|
||||||
|
if (file)
|
||||||
|
grub_file_close (file);
|
||||||
|
|
||||||
@ -0,0 +1,99 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matthew Garrett <mjg59@coreos.com>
|
||||||
|
Date: Sun, 9 Aug 2015 16:20:58 -0700
|
||||||
|
Subject: [PATCH] Rework linux16 command
|
||||||
|
|
||||||
|
We want a single buffer that contains the entire kernel image in order to
|
||||||
|
perform a TPM measurement. Allocate one and copy the entire kernel int it
|
||||||
|
before pulling out the individual blocks later on.
|
||||||
|
|
||||||
|
Signed-off-by: Matthew Garrett <mjg59@coreos.com>
|
||||||
|
---
|
||||||
|
grub-core/loader/i386/pc/linux.c | 33 +++++++++++++++++++++------------
|
||||||
|
1 file changed, 21 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
|
||||||
|
index 8be4c3b3f48..4b1750e360e 100644
|
||||||
|
--- a/grub-core/loader/i386/pc/linux.c
|
||||||
|
+++ b/grub-core/loader/i386/pc/linux.c
|
||||||
|
@@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
grub_file_t file = 0;
|
||||||
|
struct linux_i386_kernel_header lh;
|
||||||
|
grub_uint8_t setup_sects;
|
||||||
|
- grub_size_t real_size;
|
||||||
|
+ grub_size_t real_size, kernel_offset = 0;
|
||||||
|
grub_ssize_t len;
|
||||||
|
int i;
|
||||||
|
char *grub_linux_prot_chunk;
|
||||||
|
int grub_linux_is_bzimage;
|
||||||
|
grub_addr_t grub_linux_prot_target;
|
||||||
|
grub_err_t err;
|
||||||
|
+ grub_uint8_t *kernel = NULL;
|
||||||
|
|
||||||
|
grub_dl_ref (my_mod);
|
||||||
|
|
||||||
|
@@ -144,7 +145,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
if (! file)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
- if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
|
||||||
|
+ len = grub_file_size (file);
|
||||||
|
+ kernel = grub_malloc (len);
|
||||||
|
+ if (!kernel)
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (grub_file_read (file, kernel, len) != len)
|
||||||
|
{
|
||||||
|
if (!grub_errno)
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||||
|
@@ -152,6 +161,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ grub_memcpy (&lh, kernel, sizeof (lh));
|
||||||
|
+ kernel_offset = sizeof (lh);
|
||||||
|
+
|
||||||
|
if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
|
||||||
|
@@ -320,13 +332,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
grub_memmove (grub_linux_real_chunk, &lh, sizeof (lh));
|
||||||
|
|
||||||
|
len = real_size + GRUB_DISK_SECTOR_SIZE - sizeof (lh);
|
||||||
|
- if (grub_file_read (file, grub_linux_real_chunk + sizeof (lh), len) != len)
|
||||||
|
- {
|
||||||
|
- if (!grub_errno)
|
||||||
|
- grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||||
|
- argv[0]);
|
||||||
|
- goto fail;
|
||||||
|
- }
|
||||||
|
+ grub_memcpy (grub_linux_real_chunk + sizeof (lh), kernel + kernel_offset,
|
||||||
|
+ len);
|
||||||
|
+ kernel_offset += len;
|
||||||
|
|
||||||
|
if (lh.header != grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
|
||||||
|
|| grub_le_to_cpu16 (lh.version) < 0x0200)
|
||||||
|
@@ -364,9 +372,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
}
|
||||||
|
|
||||||
|
len = grub_linux16_prot_size;
|
||||||
|
- if (grub_file_read (file, grub_linux_prot_chunk, len) != len && !grub_errno)
|
||||||
|
- grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||||
|
- argv[0]);
|
||||||
|
+ grub_memcpy (grub_linux_prot_chunk, kernel + kernel_offset, len);
|
||||||
|
+ kernel_offset += len;
|
||||||
|
|
||||||
|
if (grub_errno == GRUB_ERR_NONE)
|
||||||
|
{
|
||||||
|
@@ -376,6 +383,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
|
||||||
|
fail:
|
||||||
|
|
||||||
|
+ grub_free (kernel);
|
||||||
|
+
|
||||||
|
if (file)
|
||||||
|
grub_file_close (file);
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,390 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 6 Oct 2015 16:09:25 -0400
|
||||||
|
Subject: [PATCH] Make any of the loaders that link in efi mode honor secure
|
||||||
|
boot.
|
||||||
|
|
||||||
|
And in this case "honor" means "even if somebody does link this in, they
|
||||||
|
won't register commands if SB is enabled."
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/commands/iorw.c | 7 +++++++
|
||||||
|
grub-core/commands/memrw.c | 7 +++++++
|
||||||
|
grub-core/kern/dl.c | 3 ++-
|
||||||
|
grub-core/kern/efi/efi.c | 34 ----------------------------------
|
||||||
|
grub-core/loader/efi/appleloader.c | 7 +++++++
|
||||||
|
grub-core/loader/efi/chainloader.c | 1 +
|
||||||
|
grub-core/loader/i386/bsd.c | 7 +++++++
|
||||||
|
grub-core/loader/i386/linux.c | 7 +++++++
|
||||||
|
grub-core/loader/i386/pc/linux.c | 7 +++++++
|
||||||
|
grub-core/loader/multiboot.c | 7 +++++++
|
||||||
|
grub-core/loader/xnu.c | 7 +++++++
|
||||||
|
include/grub/efi/efi.h | 1 -
|
||||||
|
include/grub/ia64/linux.h | 0
|
||||||
|
include/grub/mips/linux.h | 0
|
||||||
|
include/grub/powerpc/linux.h | 0
|
||||||
|
include/grub/sparc64/linux.h | 0
|
||||||
|
16 files changed, 59 insertions(+), 36 deletions(-)
|
||||||
|
create mode 100644 include/grub/ia64/linux.h
|
||||||
|
create mode 100644 include/grub/mips/linux.h
|
||||||
|
create mode 100644 include/grub/powerpc/linux.h
|
||||||
|
create mode 100644 include/grub/sparc64/linux.h
|
||||||
|
|
||||||
|
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
|
||||||
|
index 584baec8f91..7b2999b14b5 100644
|
||||||
|
--- a/grub-core/commands/iorw.c
|
||||||
|
+++ b/grub-core/commands/iorw.c
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
#include <grub/cpu/io.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/lockdown.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -119,6 +120,9 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(memrw)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd_read_byte =
|
||||||
|
grub_register_extcmd ("inb", grub_cmd_read, 0,
|
||||||
|
N_("PORT"), N_("Read 8-bit value from PORT."),
|
||||||
|
@@ -147,6 +151,9 @@ GRUB_MOD_INIT(memrw)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(memrw)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_extcmd (cmd_read_byte);
|
||||||
|
grub_unregister_extcmd (cmd_read_word);
|
||||||
|
grub_unregister_extcmd (cmd_read_dword);
|
||||||
|
diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
|
||||||
|
index d401a6db0ef..39cf3a06dbd 100644
|
||||||
|
--- a/grub-core/commands/memrw.c
|
||||||
|
+++ b/grub-core/commands/memrw.c
|
||||||
|
@@ -23,6 +23,7 @@
|
||||||
|
#include <grub/env.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/lockdown.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -121,6 +122,9 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(memrw)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd_read_byte =
|
||||||
|
grub_register_extcmd ("read_byte", grub_cmd_read, 0,
|
||||||
|
N_("ADDR"), N_("Read 8-bit value from ADDR."),
|
||||||
|
@@ -149,6 +153,9 @@ GRUB_MOD_INIT(memrw)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(memrw)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_extcmd (cmd_read_byte);
|
||||||
|
grub_unregister_extcmd (cmd_read_word);
|
||||||
|
grub_unregister_extcmd (cmd_read_dword);
|
||||||
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
||||||
|
index b7149370950..7afb9e6f724 100644
|
||||||
|
--- a/grub-core/kern/dl.c
|
||||||
|
+++ b/grub-core/kern/dl.c
|
||||||
|
@@ -32,6 +32,7 @@
|
||||||
|
#include <grub/env.h>
|
||||||
|
#include <grub/cache.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
/* Platforms where modules are in a readonly area of memory. */
|
||||||
|
#if defined(GRUB_MACHINE_QEMU)
|
||||||
|
@@ -704,7 +705,7 @@ grub_dl_load_file (const char *filename)
|
||||||
|
grub_dl_t mod = 0;
|
||||||
|
|
||||||
|
#ifdef GRUB_MACHINE_EFI
|
||||||
|
- if (grub_efi_secure_boot ())
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
{
|
||||||
|
#if 0
|
||||||
|
/* This is an error, but grub2-mkconfig still generates a pile of
|
||||||
|
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
|
||||||
|
index 4a2259aa1c7..8cff7be0289 100644
|
||||||
|
--- a/grub-core/kern/efi/efi.c
|
||||||
|
+++ b/grub-core/kern/efi/efi.c
|
||||||
|
@@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
|
||||||
|
return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
-grub_efi_boolean_t
|
||||||
|
-grub_efi_secure_boot (void)
|
||||||
|
-{
|
||||||
|
- grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;
|
||||||
|
- grub_size_t datasize;
|
||||||
|
- char *secure_boot = NULL;
|
||||||
|
- char *setup_mode = NULL;
|
||||||
|
- grub_efi_boolean_t ret = 0;
|
||||||
|
-
|
||||||
|
- secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
|
||||||
|
- if (datasize != 1 || !secure_boot)
|
||||||
|
- {
|
||||||
|
- grub_dprintf ("secureboot", "No SecureBoot variable\n");
|
||||||
|
- goto out;
|
||||||
|
- }
|
||||||
|
- grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
|
||||||
|
-
|
||||||
|
- setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
|
||||||
|
- if (datasize != 1 || !setup_mode)
|
||||||
|
- {
|
||||||
|
- grub_dprintf ("secureboot", "No SetupMode variable\n");
|
||||||
|
- goto out;
|
||||||
|
- }
|
||||||
|
- grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
|
||||||
|
-
|
||||||
|
- if (*secure_boot && !*setup_mode)
|
||||||
|
- ret = 1;
|
||||||
|
-
|
||||||
|
- out:
|
||||||
|
- grub_free (secure_boot);
|
||||||
|
- grub_free (setup_mode);
|
||||||
|
- return ret;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
#pragma GCC diagnostic ignored "-Wcast-align"
|
||||||
|
|
||||||
|
/* Search the mods section from the PE32/PE32+ image. This code uses
|
||||||
|
diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
|
||||||
|
index 74888c463ba..585f2b57385 100644
|
||||||
|
--- a/grub-core/loader/efi/appleloader.c
|
||||||
|
+++ b/grub-core/loader/efi/appleloader.c
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
#include <grub/misc.h>
|
||||||
|
#include <grub/efi/api.h>
|
||||||
|
#include <grub/efi/efi.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
#include <grub/command.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
|
||||||
|
@@ -227,6 +228,9 @@ static grub_command_t cmd;
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(appleloader)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd = grub_register_command ("appleloader", grub_cmd_appleloader,
|
||||||
|
N_("[OPTS]"),
|
||||||
|
/* TRANSLATORS: This command is used on EFI to
|
||||||
|
@@ -238,5 +242,8 @@ GRUB_MOD_INIT(appleloader)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(appleloader)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_command (cmd);
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
||||||
|
index b54cf6986fc..3ff305b1d32 100644
|
||||||
|
--- a/grub-core/loader/efi/chainloader.c
|
||||||
|
+++ b/grub-core/loader/efi/chainloader.c
|
||||||
|
@@ -34,6 +34,7 @@
|
||||||
|
#include <grub/efi/disk.h>
|
||||||
|
#include <grub/efi/pe32.h>
|
||||||
|
#include <grub/efi/linux.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
#include <grub/command.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/net.h>
|
||||||
|
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
|
||||||
|
index 5f3290ce17b..54befc26626 100644
|
||||||
|
--- a/grub-core/loader/i386/bsd.c
|
||||||
|
+++ b/grub-core/loader/i386/bsd.c
|
||||||
|
@@ -40,6 +40,7 @@
|
||||||
|
#ifdef GRUB_MACHINE_PCBIOS
|
||||||
|
#include <grub/machine/int.h>
|
||||||
|
#endif
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -2137,6 +2138,9 @@ static grub_command_t cmd_netbsd_module_elf, cmd_openbsd_ramdisk;
|
||||||
|
|
||||||
|
GRUB_MOD_INIT (bsd)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
/* Net and OpenBSD kernels are often compressed. */
|
||||||
|
grub_dl_load ("gzio");
|
||||||
|
|
||||||
|
@@ -2176,6 +2180,9 @@ GRUB_MOD_INIT (bsd)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI (bsd)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_extcmd (cmd_freebsd);
|
||||||
|
grub_unregister_extcmd (cmd_openbsd);
|
||||||
|
grub_unregister_extcmd (cmd_netbsd);
|
||||||
|
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
||||||
|
index dccf3bb3005..4aeb0e4b9a6 100644
|
||||||
|
--- a/grub-core/loader/i386/linux.c
|
||||||
|
+++ b/grub-core/loader/i386/linux.c
|
||||||
|
@@ -37,6 +37,7 @@
|
||||||
|
#include <grub/linux.h>
|
||||||
|
#include <grub/machine/kernel.h>
|
||||||
|
#include <grub/safemath.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -1138,6 +1139,9 @@ static grub_command_t cmd_linux, cmd_initrd;
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(linux)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
|
||||||
|
0, N_("Load Linux."));
|
||||||
|
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
|
||||||
|
@@ -1147,6 +1151,9 @@ GRUB_MOD_INIT(linux)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(linux)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_command (cmd_linux);
|
||||||
|
grub_unregister_command (cmd_initrd);
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
|
||||||
|
index 4b1750e360e..e3fa1221e81 100644
|
||||||
|
--- a/grub-core/loader/i386/pc/linux.c
|
||||||
|
+++ b/grub-core/loader/i386/pc/linux.c
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
#include <grub/lib/cmdline.h>
|
||||||
|
#include <grub/linux.h>
|
||||||
|
#include <grub/safemath.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -487,6 +488,9 @@ static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16;
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(linux16)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd_linux =
|
||||||
|
grub_register_command ("linux", grub_cmd_linux,
|
||||||
|
0, N_("Load Linux."));
|
||||||
|
@@ -504,6 +508,9 @@ GRUB_MOD_INIT(linux16)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(linux16)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_command (cmd_linux);
|
||||||
|
grub_unregister_command (cmd_linux16);
|
||||||
|
grub_unregister_command (cmd_initrd);
|
||||||
|
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
|
||||||
|
index facb13f3d36..47e481f4576 100644
|
||||||
|
--- a/grub-core/loader/multiboot.c
|
||||||
|
+++ b/grub-core/loader/multiboot.c
|
||||||
|
@@ -50,6 +50,7 @@
|
||||||
|
#include <grub/video.h>
|
||||||
|
#include <grub/memory.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -444,6 +445,9 @@ static grub_command_t cmd_multiboot, cmd_module;
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(multiboot)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd_multiboot =
|
||||||
|
#ifdef GRUB_USE_MULTIBOOT2
|
||||||
|
grub_register_command ("multiboot2", grub_cmd_multiboot,
|
||||||
|
@@ -464,6 +468,9 @@ GRUB_MOD_INIT(multiboot)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(multiboot)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
grub_unregister_command (cmd_multiboot);
|
||||||
|
grub_unregister_command (cmd_module);
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
|
||||||
|
index 1c0cf6a430a..baa54e652ab 100644
|
||||||
|
--- a/grub-core/loader/xnu.c
|
||||||
|
+++ b/grub-core/loader/xnu.c
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/verify.h>
|
||||||
|
#include <grub/safemath.h>
|
||||||
|
+#include <grub/efi/sb.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -1497,6 +1498,9 @@ static grub_extcmd_t cmd_splash;
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(xnu)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
cmd_kernel = grub_register_command ("xnu_kernel", grub_cmd_xnu_kernel, 0,
|
||||||
|
N_("Load XNU image."));
|
||||||
|
cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64,
|
||||||
|
@@ -1540,6 +1544,9 @@ GRUB_MOD_INIT(xnu)
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(xnu)
|
||||||
|
{
|
||||||
|
+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
#ifndef GRUB_MACHINE_EMU
|
||||||
|
grub_unregister_command (cmd_resume);
|
||||||
|
#endif
|
||||||
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
||||||
|
index 6295df85f3f..585fa6662b6 100644
|
||||||
|
--- a/include/grub/efi/efi.h
|
||||||
|
+++ b/include/grub/efi/efi.h
|
||||||
|
@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
|
||||||
|
const grub_efi_guid_t *guid,
|
||||||
|
void *data,
|
||||||
|
grub_size_t datasize);
|
||||||
|
-grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
|
||||||
|
int
|
||||||
|
EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
|
||||||
|
const grub_efi_device_path_t *dp2);
|
||||||
|
diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..e69de29bb2d
|
||||||
|
diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..e69de29bb2d
|
||||||
|
diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..e69de29bb2d
|
||||||
|
diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..e69de29bb2d
|
||||||
@ -0,0 +1,264 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 8 Jul 2019 12:32:37 +0200
|
||||||
|
Subject: [PATCH] Handle multi-arch (64-on-32) boot in linuxefi loader.
|
||||||
|
|
||||||
|
Allow booting 64-bit kernels on 32-bit EFI on x86.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/loader/efi/linux.c | 9 +++-
|
||||||
|
grub-core/loader/i386/efi/linux.c | 110 ++++++++++++++++++++++++++------------
|
||||||
|
include/grub/i386/linux.h | 7 ++-
|
||||||
|
3 files changed, 89 insertions(+), 37 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
|
||||||
|
index c8ecce6dfd0..0622dfa48d4 100644
|
||||||
|
--- a/grub-core/loader/efi/linux.c
|
||||||
|
+++ b/grub-core/loader/efi/linux.c
|
||||||
|
@@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
|
||||||
|
typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
|
||||||
|
|
||||||
|
grub_err_t
|
||||||
|
-grub_efi_linux_boot (void *kernel_addr, grub_off_t offset,
|
||||||
|
+grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
|
||||||
|
void *kernel_params)
|
||||||
|
{
|
||||||
|
handover_func hf;
|
||||||
|
+ int offset = 0;
|
||||||
|
|
||||||
|
- hf = (handover_func)((char *)kernel_addr + offset);
|
||||||
|
+#ifdef __x86_64__
|
||||||
|
+ offset = 512;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ hf = (handover_func)((char *)kernel_addr + handover_offset + offset);
|
||||||
|
hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
|
||||||
|
|
||||||
|
return GRUB_ERR_BUG;
|
||||||
|
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
|
||||||
|
index 6b24cbb9483..3017d0f3e52 100644
|
||||||
|
--- a/grub-core/loader/i386/efi/linux.c
|
||||||
|
+++ b/grub-core/loader/i386/efi/linux.c
|
||||||
|
@@ -44,14 +44,10 @@ static char *linux_cmdline;
|
||||||
|
static grub_err_t
|
||||||
|
grub_linuxefi_boot (void)
|
||||||
|
{
|
||||||
|
- int offset = 0;
|
||||||
|
-
|
||||||
|
-#ifdef __x86_64__
|
||||||
|
- offset = 512;
|
||||||
|
-#endif
|
||||||
|
asm volatile ("cli");
|
||||||
|
|
||||||
|
- return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset,
|
||||||
|
+ return grub_efi_linux_boot ((char *)kernel_mem,
|
||||||
|
+ handover_offset,
|
||||||
|
params);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -153,14 +149,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
return grub_errno;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#define MIN(a, b) \
|
||||||
|
+ ({ typeof (a) _a = (a); \
|
||||||
|
+ typeof (b) _b = (b); \
|
||||||
|
+ _a < _b ? _a : _b; })
|
||||||
|
+
|
||||||
|
static grub_err_t
|
||||||
|
grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
int argc, char *argv[])
|
||||||
|
{
|
||||||
|
grub_file_t file = 0;
|
||||||
|
- struct linux_i386_kernel_header lh;
|
||||||
|
- grub_ssize_t len, start, filelen;
|
||||||
|
+ struct linux_i386_kernel_header *lh = NULL;
|
||||||
|
+ grub_ssize_t start, filelen;
|
||||||
|
void *kernel = NULL;
|
||||||
|
+ int setup_header_end_offset;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
grub_dl_ref (my_mod);
|
||||||
|
@@ -200,48 +202,79 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- params = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(16384));
|
||||||
|
-
|
||||||
|
+ params = grub_efi_allocate_pages_max (0x3fffffff,
|
||||||
|
+ BYTES_TO_PAGES(sizeof(*params)));
|
||||||
|
if (! params)
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- grub_dprintf ("linux", "params = %lx\n", (unsigned long) params);
|
||||||
|
+ grub_dprintf ("linux", "params = %p\n", params);
|
||||||
|
|
||||||
|
- grub_memset (params, 0, 16384);
|
||||||
|
+ grub_memset (params, 0, sizeof(*params));
|
||||||
|
|
||||||
|
- grub_memcpy (&lh, kernel, sizeof (lh));
|
||||||
|
-
|
||||||
|
- if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
|
||||||
|
+ setup_header_end_offset = *((grub_uint8_t *)kernel + 0x201);
|
||||||
|
+ grub_dprintf ("linux", "copying %lu bytes from %p to %p\n",
|
||||||
|
+ MIN((grub_size_t)0x202+setup_header_end_offset,
|
||||||
|
+ sizeof (*params)) - 0x1f1,
|
||||||
|
+ (grub_uint8_t *)kernel + 0x1f1,
|
||||||
|
+ (grub_uint8_t *)params + 0x1f1);
|
||||||
|
+ grub_memcpy ((grub_uint8_t *)params + 0x1f1,
|
||||||
|
+ (grub_uint8_t *)kernel + 0x1f1,
|
||||||
|
+ MIN((grub_size_t)0x202+setup_header_end_offset,sizeof (*params)) - 0x1f1);
|
||||||
|
+ lh = (struct linux_i386_kernel_header *)params;
|
||||||
|
+ grub_dprintf ("linux", "lh is at %p\n", lh);
|
||||||
|
+ grub_dprintf ("linux", "checking lh->boot_flag\n");
|
||||||
|
+ if (lh->boot_flag != grub_cpu_to_le16 (0xaa55))
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, N_("invalid magic number"));
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
|
||||||
|
+ grub_dprintf ("linux", "checking lh->setup_sects\n");
|
||||||
|
+ if (lh->setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, N_("too many setup sectors"));
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (lh.version < grub_cpu_to_le16 (0x020b))
|
||||||
|
+ grub_dprintf ("linux", "checking lh->version\n");
|
||||||
|
+ if (lh->version < grub_cpu_to_le16 (0x020b))
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, N_("kernel too old"));
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!lh.handover_offset)
|
||||||
|
+ grub_dprintf ("linux", "checking lh->handover_offset\n");
|
||||||
|
+ if (!lh->handover_offset)
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_BAD_OS, N_("kernel doesn't support EFI handover"));
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(__x86_64__) || defined(__aarch64__)
|
||||||
|
+ grub_dprintf ("linux", "checking lh->xloadflags\n");
|
||||||
|
+ if (!(lh->xloadflags & LINUX_XLF_KERNEL_64))
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_BAD_OS, N_("kernel doesn't support 64-bit CPUs"));
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if defined(__i386__)
|
||||||
|
+ if ((lh->xloadflags & LINUX_XLF_KERNEL_64) &&
|
||||||
|
+ !(lh->xloadflags & LINUX_XLF_EFI_HANDOVER_32))
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_BAD_OS,
|
||||||
|
+ N_("kernel doesn't support 32-bit handover"));
|
||||||
|
+ goto fail;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
grub_dprintf ("linux", "setting up cmdline\n");
|
||||||
|
linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
|
||||||
|
- BYTES_TO_PAGES(lh.cmdline_size + 1));
|
||||||
|
-
|
||||||
|
+ BYTES_TO_PAGES(lh->cmdline_size + 1));
|
||||||
|
if (!linux_cmdline)
|
||||||
|
{
|
||||||
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
|
||||||
|
@@ -254,22 +287,24 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
|
||||||
|
grub_create_loader_cmdline (argc, argv,
|
||||||
|
linux_cmdline + sizeof (LINUX_IMAGE) - 1,
|
||||||
|
- lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
|
||||||
|
+ lh->cmdline_size - (sizeof (LINUX_IMAGE) - 1),
|
||||||
|
GRUB_VERIFY_KERNEL_CMDLINE);
|
||||||
|
|
||||||
|
- lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
|
||||||
|
+ grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
|
||||||
|
+ grub_dprintf ("linux", "setting lh->cmd_line_ptr\n");
|
||||||
|
+ lh->cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
|
||||||
|
|
||||||
|
- handover_offset = lh.handover_offset;
|
||||||
|
+ grub_dprintf ("linux", "computing handover offset\n");
|
||||||
|
+ handover_offset = lh->handover_offset;
|
||||||
|
|
||||||
|
- start = (lh.setup_sects + 1) * 512;
|
||||||
|
- len = grub_file_size(file) - start;
|
||||||
|
+ start = (lh->setup_sects + 1) * 512;
|
||||||
|
|
||||||
|
- kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
|
||||||
|
- BYTES_TO_PAGES(lh.init_size));
|
||||||
|
+ kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
|
||||||
|
+ BYTES_TO_PAGES(lh->init_size));
|
||||||
|
|
||||||
|
if (!kernel_mem)
|
||||||
|
kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
|
||||||
|
- BYTES_TO_PAGES(lh.init_size));
|
||||||
|
+ BYTES_TO_PAGES(lh->init_size));
|
||||||
|
|
||||||
|
if (!kernel_mem)
|
||||||
|
{
|
||||||
|
@@ -277,14 +312,21 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- grub_memcpy (kernel_mem, (char *)kernel + start, len);
|
||||||
|
+ grub_dprintf ("linux", "kernel_mem = %lx\n", (unsigned long) kernel_mem);
|
||||||
|
+
|
||||||
|
grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
|
||||||
|
loaded=1;
|
||||||
|
+ grub_dprintf ("linux", "setting lh->code32_start to %p\n", kernel_mem);
|
||||||
|
+ lh->code32_start = (grub_uint32_t)(grub_addr_t) kernel_mem;
|
||||||
|
|
||||||
|
- lh.code32_start = (grub_uint32_t)(grub_uint64_t) kernel_mem;
|
||||||
|
- grub_memcpy (params, &lh, 2 * 512);
|
||||||
|
+ grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
|
||||||
|
|
||||||
|
- params->type_of_loader = 0x21;
|
||||||
|
+ grub_dprintf ("linux", "setting lh->type_of_loader\n");
|
||||||
|
+ lh->type_of_loader = 0x6;
|
||||||
|
+
|
||||||
|
+ grub_dprintf ("linux", "setting lh->ext_loader_{type,ver}\n");
|
||||||
|
+ params->ext_loader_type = 0;
|
||||||
|
+ params->ext_loader_ver = 2;
|
||||||
|
grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
|
||||||
|
kernel_mem, handover_offset);
|
||||||
|
|
||||||
|
@@ -301,10 +343,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
loaded = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (linux_cmdline && !loaded)
|
||||||
|
+ if (linux_cmdline && lh && !loaded)
|
||||||
|
grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
|
||||||
|
linux_cmdline,
|
||||||
|
- BYTES_TO_PAGES(lh.cmdline_size + 1));
|
||||||
|
+ BYTES_TO_PAGES(lh->cmdline_size + 1));
|
||||||
|
|
||||||
|
if (kernel_mem && !loaded)
|
||||||
|
grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
|
||||||
|
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
|
||||||
|
index eddf9251d9a..25ef52c04eb 100644
|
||||||
|
--- a/include/grub/i386/linux.h
|
||||||
|
+++ b/include/grub/i386/linux.h
|
||||||
|
@@ -138,7 +138,12 @@ struct linux_i386_kernel_header
|
||||||
|
grub_uint32_t kernel_alignment;
|
||||||
|
grub_uint8_t relocatable;
|
||||||
|
grub_uint8_t min_alignment;
|
||||||
|
- grub_uint8_t pad[2];
|
||||||
|
+#define LINUX_XLF_KERNEL_64 (1<<0)
|
||||||
|
+#define LINUX_XLF_CAN_BE_LOADED_ABOVE_4G (1<<1)
|
||||||
|
+#define LINUX_XLF_EFI_HANDOVER_32 (1<<2)
|
||||||
|
+#define LINUX_XLF_EFI_HANDOVER_64 (1<<3)
|
||||||
|
+#define LINUX_XLF_EFI_KEXEC (1<<4)
|
||||||
|
+ grub_uint16_t xloadflags;
|
||||||
|
grub_uint32_t cmdline_size;
|
||||||
|
grub_uint32_t hardware_subarch;
|
||||||
|
grub_uint64_t hardware_subarch_data;
|
||||||
@ -0,0 +1,248 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 8 Jul 2019 12:55:29 +0200
|
||||||
|
Subject: [PATCH] re-write .gitignore
|
||||||
|
|
||||||
|
---
|
||||||
|
.gitignore | 152 ++++++++++++++++++++++++++++++++++++++
|
||||||
|
docs/.gitignore | 5 ++
|
||||||
|
grub-core/.gitignore | 16 ++++
|
||||||
|
grub-core/lib/.gitignore | 1 +
|
||||||
|
include/grub/gcrypt/.gitignore | 2 +
|
||||||
|
po/.gitignore | 5 ++
|
||||||
|
util/bash-completion.d/.gitignore | 2 +
|
||||||
|
7 files changed, 183 insertions(+)
|
||||||
|
create mode 100644 docs/.gitignore
|
||||||
|
create mode 100644 grub-core/.gitignore
|
||||||
|
create mode 100644 grub-core/lib/.gitignore
|
||||||
|
create mode 100644 include/grub/gcrypt/.gitignore
|
||||||
|
create mode 100644 po/.gitignore
|
||||||
|
create mode 100644 util/bash-completion.d/.gitignore
|
||||||
|
|
||||||
|
diff --git a/.gitignore b/.gitignore
|
||||||
|
index f6a1bd05175..594d0134d33 100644
|
||||||
|
--- a/.gitignore
|
||||||
|
+++ b/.gitignore
|
||||||
|
@@ -275,3 +275,155 @@ widthspec.bin
|
||||||
|
/xfs_test
|
||||||
|
/xzcompress_test
|
||||||
|
/zfs_test
|
||||||
|
+=======
|
||||||
|
+# things ./autogen.sh will create
|
||||||
|
+/Makefile.utilgcry.def
|
||||||
|
+/ABOUT-NLS
|
||||||
|
+/aclocal.m4
|
||||||
|
+/autom4te.cache
|
||||||
|
+/build-aux
|
||||||
|
+/configure
|
||||||
|
+/gnulib
|
||||||
|
+/grub-core/lib/gnulib/
|
||||||
|
+/Makefile
|
||||||
|
+
|
||||||
|
+# things very common editors create that we never want
|
||||||
|
+*~
|
||||||
|
+.*.sw?
|
||||||
|
+*.patch
|
||||||
|
+
|
||||||
|
+# stuff you're likely to make while building test trees
|
||||||
|
+grub.cfg
|
||||||
|
+/build*/
|
||||||
|
+
|
||||||
|
+# built objects across the whole tree
|
||||||
|
+Makefile.in
|
||||||
|
+*.a
|
||||||
|
+*.am
|
||||||
|
+*.efi
|
||||||
|
+*.exec
|
||||||
|
+*.image
|
||||||
|
+*.img
|
||||||
|
+*.info
|
||||||
|
+*.lst
|
||||||
|
+*.marker
|
||||||
|
+/m4
|
||||||
|
+*.mod
|
||||||
|
+*.module
|
||||||
|
+*.o
|
||||||
|
+*.pf2
|
||||||
|
+*.yy.[ch]
|
||||||
|
+.deps/
|
||||||
|
+.deps-core/
|
||||||
|
+.deps-util/
|
||||||
|
+.dirstamp
|
||||||
|
+
|
||||||
|
+# next are things you get if you do ./configure in the topdir (for e.g.
|
||||||
|
+# "make dist" invocation.
|
||||||
|
+/config-util.h
|
||||||
|
+/config.h
|
||||||
|
+/include/grub/cpu
|
||||||
|
+/include/grub/machine
|
||||||
|
+/INSTALL
|
||||||
|
+/INSTALL.grub
|
||||||
|
+/po/Makefile.in.in
|
||||||
|
+/po/Makevars
|
||||||
|
+/po/Makevars.template
|
||||||
|
+/po/POTFILES
|
||||||
|
+/po/Rules-quot
|
||||||
|
+/stamp-h
|
||||||
|
+/stamp-h1
|
||||||
|
+bootstrap.log
|
||||||
|
+config.log
|
||||||
|
+config.status
|
||||||
|
+
|
||||||
|
+# stuff "make dist" creates
|
||||||
|
+ChangeLog
|
||||||
|
+grub-*.tar
|
||||||
|
+grub-*.tar.*
|
||||||
|
+
|
||||||
|
+# stuff "make" creates
|
||||||
|
+/[[:digit:]][[:digit:]]_?*
|
||||||
|
+/ascii.h
|
||||||
|
+/build-grub-gen-asciih
|
||||||
|
+/build-grub-gen-widthspec
|
||||||
|
+/build-grub-mkfont
|
||||||
|
+/config-util.h.in
|
||||||
|
+/garbage-gen
|
||||||
|
+/grub*-bios-setup
|
||||||
|
+/grub*-bios-setup.8
|
||||||
|
+/grub*-editenv
|
||||||
|
+/grub*-editenv.1
|
||||||
|
+/grub*-file
|
||||||
|
+/grub*-file.1
|
||||||
|
+/grub*-fs-tester
|
||||||
|
+/grub*-fstest
|
||||||
|
+/grub*-fstest.1
|
||||||
|
+/grub*-get-kernel-settings
|
||||||
|
+/grub*-get-kernel-settings.3
|
||||||
|
+/grub*-glue-efi
|
||||||
|
+/grub*-glue-efi.1
|
||||||
|
+/grub*-install
|
||||||
|
+/grub*-install.8
|
||||||
|
+/grub*-kbdcomp
|
||||||
|
+/grub*-kbdcomp.1
|
||||||
|
+/grub*-macbless
|
||||||
|
+/grub*-macbless.8
|
||||||
|
+/grub*-menulst2cfg
|
||||||
|
+/grub*-menulst2cfg.1
|
||||||
|
+/grub*-mount
|
||||||
|
+/grub*-mount.1
|
||||||
|
+/grub*-mkconfig
|
||||||
|
+/grub*-mkconfig.8
|
||||||
|
+/grub*-mkconfig_lib
|
||||||
|
+/grub*-mkfont
|
||||||
|
+/grub*-mkfont.1
|
||||||
|
+/grub*-mkimage
|
||||||
|
+/grub*-mkimage.1
|
||||||
|
+/grub*-mklayout
|
||||||
|
+/grub*-mklayout.1
|
||||||
|
+/grub*-mknetdir
|
||||||
|
+/grub*-mknetdir.1
|
||||||
|
+/grub*-mkpasswd-pbkdf2
|
||||||
|
+/grub*-mkpasswd-pbkdf2.1
|
||||||
|
+/grub*-mkrelpath
|
||||||
|
+/grub*-mkrelpath.1
|
||||||
|
+/grub*-mkrescue
|
||||||
|
+/grub*-mkrescue.1
|
||||||
|
+/grub*-mkstandalone
|
||||||
|
+/grub*-mkstandalone.1
|
||||||
|
+/grub*-ofpathname
|
||||||
|
+/grub*-ofpathname.8
|
||||||
|
+/grub*-probe
|
||||||
|
+/grub*-probe.8
|
||||||
|
+/grub*-reboot
|
||||||
|
+/grub*-reboot.8
|
||||||
|
+/grub*-render-label
|
||||||
|
+/grub*-render-label.1
|
||||||
|
+/grub*-rpm-sort
|
||||||
|
+/grub*-rpm-sort.8
|
||||||
|
+/grub*-script-check
|
||||||
|
+/grub*-script-check.1
|
||||||
|
+/grub*-set-bootflag
|
||||||
|
+/grub*-set-bootflag.1
|
||||||
|
+/grub*-set-default
|
||||||
|
+/grub*-set-default.8
|
||||||
|
+/grub*-set-password
|
||||||
|
+/grub*-set-password.8
|
||||||
|
+/grub*-shell
|
||||||
|
+/grub*-shell-tester
|
||||||
|
+/grub*-sparc64-setup
|
||||||
|
+/grub*-sparc64-setup.8
|
||||||
|
+/grub*-syslinux2cfg
|
||||||
|
+/grub*-syslinux2cfg.1
|
||||||
|
+/grub*-switch-to-blscfg
|
||||||
|
+/grub*-switch-to-blscfg.8
|
||||||
|
+/grub_fstest.pp
|
||||||
|
+/grub_fstest_init.c
|
||||||
|
+/grub_fstest_init.lst
|
||||||
|
+/grub_script.tab.[ch]
|
||||||
|
+/libgrub.pp
|
||||||
|
+/libgrub_a_init.c
|
||||||
|
+/libgrub_a_init.lst
|
||||||
|
+/stamp-h.in
|
||||||
|
+/widthspec.h
|
||||||
|
diff --git a/docs/.gitignore b/docs/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..e1d849ef95b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/docs/.gitignore
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+/*.in
|
||||||
|
+/Makefile
|
||||||
|
+/stamp-1
|
||||||
|
+/stamp-vti
|
||||||
|
+/version*.texi
|
||||||
|
diff --git a/grub-core/.gitignore b/grub-core/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..2acce281159
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/.gitignore
|
||||||
|
@@ -0,0 +1,16 @@
|
||||||
|
+/*.lst
|
||||||
|
+/Makefile
|
||||||
|
+/Makefile.gcry.def
|
||||||
|
+/unidata.c
|
||||||
|
+/build-grub-module-verifier
|
||||||
|
+/gdb_grub
|
||||||
|
+/genmod.sh
|
||||||
|
+/gensyminfo.sh
|
||||||
|
+/gentrigtables
|
||||||
|
+/gmodule.pl
|
||||||
|
+/grub_script.tab.[ch]
|
||||||
|
+/modinfo.sh
|
||||||
|
+/rs_decoder.h
|
||||||
|
+/symlist.c
|
||||||
|
+/symlist.h
|
||||||
|
+/trigtables.c
|
||||||
|
diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..68154591404
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/lib/.gitignore
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+/libgcrypt-grub/
|
||||||
|
diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..8fbf5646246
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/include/grub/gcrypt/.gitignore
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+g10lib.h
|
||||||
|
+gcrypt.h
|
||||||
|
diff --git a/po/.gitignore b/po/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..f507e7741e3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/po/.gitignore
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+/Makefile
|
||||||
|
+/POTFILES*.in
|
||||||
|
+/grub.pot
|
||||||
|
+/remove-potcdate.sed
|
||||||
|
+/stamp-po
|
||||||
|
diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..6813a527ad3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/bash-completion.d/.gitignore
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+Makefile
|
||||||
|
+grub
|
||||||
@ -0,0 +1,172 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||||
|
Date: Thu, 20 Sep 2012 18:07:39 -0300
|
||||||
|
Subject: [PATCH] IBM client architecture (CAS) reboot support
|
||||||
|
|
||||||
|
This is an implementation of IBM client architecture (CAS) reboot for GRUB.
|
||||||
|
|
||||||
|
There are cases where the POWER firmware must reboot in order to support
|
||||||
|
specific features requested by a kernel. The kernel calls
|
||||||
|
ibm,client-architecture-support and it may either return or reboot with the new
|
||||||
|
feature set. eg:
|
||||||
|
|
||||||
|
Calling ibm,client-architecture-support.../
|
||||||
|
Elapsed time since release of system processors: 70959 mins 50 secs
|
||||||
|
Welcome to GRUB!
|
||||||
|
|
||||||
|
Instead of return to the GRUB menu, it will check if the flag for CAS reboot is
|
||||||
|
set. If so, grub will automatically boot the last booted kernel using the same
|
||||||
|
parameters
|
||||||
|
---
|
||||||
|
grub-core/kern/ieee1275/openfw.c | 63 ++++++++++++++++++++++++++++++++++++++++
|
||||||
|
grub-core/normal/main.c | 19 ++++++++++++
|
||||||
|
grub-core/script/execute.c | 7 +++++
|
||||||
|
include/grub/ieee1275/ieee1275.h | 2 ++
|
||||||
|
4 files changed, 91 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
|
||||||
|
index 4d493ab7661..3a6689abb11 100644
|
||||||
|
--- a/grub-core/kern/ieee1275/openfw.c
|
||||||
|
+++ b/grub-core/kern/ieee1275/openfw.c
|
||||||
|
@@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void)
|
||||||
|
|
||||||
|
return bootpath;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/* Check if it's a CAS reboot. If so, set the script to be executed. */
|
||||||
|
+int
|
||||||
|
+grub_ieee1275_cas_reboot (char *script)
|
||||||
|
+{
|
||||||
|
+ grub_uint32_t ibm_ca_support_reboot;
|
||||||
|
+ grub_uint32_t ibm_fw_nbr_reboots;
|
||||||
|
+ char property_value[10];
|
||||||
|
+ grub_ssize_t actual;
|
||||||
|
+ grub_ieee1275_ihandle_t options;
|
||||||
|
+
|
||||||
|
+ if (grub_ieee1275_finddevice ("/options", &options) < 0)
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ /* Check two properties, one is enough to get cas reboot value */
|
||||||
|
+ ibm_ca_support_reboot = 0;
|
||||||
|
+ if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen,
|
||||||
|
+ "ibm,client-architecture-support-reboot",
|
||||||
|
+ &ibm_ca_support_reboot,
|
||||||
|
+ sizeof (ibm_ca_support_reboot),
|
||||||
|
+ &actual) >= 0)
|
||||||
|
+ grub_dprintf("ieee1275", "ibm,client-architecture-support-reboot: %u\n",
|
||||||
|
+ ibm_ca_support_reboot);
|
||||||
|
+
|
||||||
|
+ ibm_fw_nbr_reboots = 0;
|
||||||
|
+ if (grub_ieee1275_get_property (options, "ibm,fw-nbr-reboots",
|
||||||
|
+ property_value, sizeof (property_value),
|
||||||
|
+ &actual) >= 0)
|
||||||
|
+ {
|
||||||
|
+ property_value[sizeof (property_value) - 1] = 0;
|
||||||
|
+ ibm_fw_nbr_reboots = (grub_uint8_t) grub_strtoul (property_value, 0, 10);
|
||||||
|
+ grub_dprintf("ieee1275", "ibm,fw-nbr-reboots: %u\n", ibm_fw_nbr_reboots);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ibm_ca_support_reboot || ibm_fw_nbr_reboots)
|
||||||
|
+ {
|
||||||
|
+ if (! grub_ieee1275_get_property_length (options, "boot-last-label", &actual))
|
||||||
|
+ {
|
||||||
|
+ if (actual > 1024)
|
||||||
|
+ script = grub_realloc (script, actual + 1);
|
||||||
|
+ grub_ieee1275_get_property (options, "boot-last-label", script, actual,
|
||||||
|
+ &actual);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_ieee1275_set_boot_last_label ("");
|
||||||
|
+
|
||||||
|
+ return -1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int grub_ieee1275_set_boot_last_label (const char *text)
|
||||||
|
+{
|
||||||
|
+ grub_ieee1275_ihandle_t options;
|
||||||
|
+ grub_ssize_t actual;
|
||||||
|
+
|
||||||
|
+ grub_dprintf("ieee1275", "set boot_last_label (size: %u)\n", grub_strlen(text));
|
||||||
|
+ if (! grub_ieee1275_finddevice ("/options", &options) &&
|
||||||
|
+ options != (grub_ieee1275_ihandle_t) -1)
|
||||||
|
+ grub_ieee1275_set_property (options, "boot-last-label", text,
|
||||||
|
+ grub_strlen (text), &actual);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index c4ebe9e22ad..70614de1565 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -34,6 +34,9 @@
|
||||||
|
#include <grub/charset.h>
|
||||||
|
#include <grub/script_sh.h>
|
||||||
|
#include <grub/bufio.h>
|
||||||
|
+#ifdef GRUB_MACHINE_IEEE1275
|
||||||
|
+#include <grub/ieee1275/ieee1275.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -276,6 +279,22 @@ grub_normal_execute (const char *config, int nested, int batch)
|
||||||
|
{
|
||||||
|
menu = read_config_file (config);
|
||||||
|
|
||||||
|
+#ifdef GRUB_MACHINE_IEEE1275
|
||||||
|
+ int boot;
|
||||||
|
+ boot = 0;
|
||||||
|
+ char *script;
|
||||||
|
+ script = grub_malloc (1024);
|
||||||
|
+ if (! grub_ieee1275_cas_reboot (script))
|
||||||
|
+ {
|
||||||
|
+ char *dummy[1] = { NULL };
|
||||||
|
+ if (! grub_script_execute_sourcecode (script))
|
||||||
|
+ boot = 1;
|
||||||
|
+ }
|
||||||
|
+ grub_free (script);
|
||||||
|
+ if (boot)
|
||||||
|
+ grub_command_execute ("boot", 0, 0);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/* Ignore any error. */
|
||||||
|
grub_errno = GRUB_ERR_NONE;
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
|
||||||
|
index 25158407dd8..ad80399246a 100644
|
||||||
|
--- a/grub-core/script/execute.c
|
||||||
|
+++ b/grub-core/script/execute.c
|
||||||
|
@@ -28,6 +28,9 @@
|
||||||
|
#include <grub/extcmd.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/verify.h>
|
||||||
|
+#ifdef GRUB_MACHINE_IEEE1275
|
||||||
|
+#include <grub/ieee1275/ieee1275.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Max digits for a char is 3 (0xFF is 255), similarly for an int it
|
||||||
|
is sizeof (int) * 3, and one extra for a possible -ve sign. */
|
||||||
|
@@ -883,6 +886,10 @@ grub_script_execute_sourcecode (const char *source)
|
||||||
|
grub_err_t ret = 0;
|
||||||
|
struct grub_script *parsed_script;
|
||||||
|
|
||||||
|
+#ifdef GRUB_MACHINE_IEEE1275
|
||||||
|
+ grub_ieee1275_set_boot_last_label (source);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
while (source)
|
||||||
|
{
|
||||||
|
char *line;
|
||||||
|
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
|
||||||
|
index 73e2f464475..0a599607f31 100644
|
||||||
|
--- a/include/grub/ieee1275/ieee1275.h
|
||||||
|
+++ b/include/grub/ieee1275/ieee1275.h
|
||||||
|
@@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
|
||||||
|
void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias *alias);
|
||||||
|
void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath,
|
||||||
|
struct grub_ieee1275_devalias *alias);
|
||||||
|
+int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char *script);
|
||||||
|
+int EXPORT_FUNC(grub_ieee1275_set_boot_last_label) (const char *text);
|
||||||
|
|
||||||
|
char *EXPORT_FUNC(grub_ieee1275_get_boot_dev) (void);
|
||||||
|
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||||
|
Date: Tue, 11 Jun 2013 15:14:05 -0300
|
||||||
|
Subject: [PATCH] Disable GRUB video support for IBM power machines
|
||||||
|
|
||||||
|
Should fix the problem in bugzilla:
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=973205
|
||||||
|
---
|
||||||
|
grub-core/kern/ieee1275/cmain.c | 5 ++++-
|
||||||
|
grub-core/video/ieee1275.c | 9 ++++++---
|
||||||
|
include/grub/ieee1275/ieee1275.h | 2 ++
|
||||||
|
3 files changed, 12 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
|
||||||
|
index 20cbbd761ec..04df9d2c667 100644
|
||||||
|
--- a/grub-core/kern/ieee1275/cmain.c
|
||||||
|
+++ b/grub-core/kern/ieee1275/cmain.c
|
||||||
|
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
|
||||||
|
- grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
|
||||||
|
+ {
|
||||||
|
+ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
|
||||||
|
+ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* Old Macs have no key repeat, newer ones have fully working one.
|
||||||
|
The ones inbetween when repeated key generates an escaoe sequence
|
||||||
|
diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
|
||||||
|
index 17a3dbbb575..b8e4b3feb32 100644
|
||||||
|
--- a/grub-core/video/ieee1275.c
|
||||||
|
+++ b/grub-core/video/ieee1275.c
|
||||||
|
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
|
||||||
|
|
||||||
|
GRUB_MOD_INIT(ieee1275_fb)
|
||||||
|
{
|
||||||
|
- find_display ();
|
||||||
|
- if (display)
|
||||||
|
- grub_video_register (&grub_video_ieee1275_adapter);
|
||||||
|
+ if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT))
|
||||||
|
+ {
|
||||||
|
+ find_display ();
|
||||||
|
+ if (display)
|
||||||
|
+ grub_video_register (&grub_video_ieee1275_adapter);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
GRUB_MOD_FINI(ieee1275_fb)
|
||||||
|
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
|
||||||
|
index 0a599607f31..b5a1d49bbc3 100644
|
||||||
|
--- a/include/grub/ieee1275/ieee1275.h
|
||||||
|
+++ b/include/grub/ieee1275/ieee1275.h
|
||||||
|
@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
|
||||||
|
GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
|
||||||
|
|
||||||
|
GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
|
||||||
|
+
|
||||||
|
+ GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
|
||||||
|
};
|
||||||
|
|
||||||
|
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Wed, 3 Apr 2013 14:35:34 -0400
|
||||||
|
Subject: [PATCH] Move bash completion script (#922997)
|
||||||
|
|
||||||
|
Apparently these go in a new place now.
|
||||||
|
---
|
||||||
|
configure.ac | 11 +++++++++++
|
||||||
|
util/bash-completion.d/Makefile.am | 1 -
|
||||||
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 7517fc49d98..8331f95b645 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -314,6 +314,14 @@ AC_SUBST(grubdirname)
|
||||||
|
AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
|
||||||
|
[Default grub directory name])
|
||||||
|
|
||||||
|
+PKG_PROG_PKG_CONFIG
|
||||||
|
+AS_IF([$($PKG_CONFIG --exists bash-completion)], [
|
||||||
|
+ bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
|
||||||
|
+] , [
|
||||||
|
+ bashcompletiondir=${datadir}/bash-completion/completions
|
||||||
|
+])
|
||||||
|
+AC_SUBST(bashcompletiondir)
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Checks for build programs.
|
||||||
|
#
|
||||||
|
@@ -525,6 +533,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
|
||||||
|
# Check for target programs.
|
||||||
|
#
|
||||||
|
|
||||||
|
+# This makes sure pkg.m4 is available.
|
||||||
|
+m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
|
||||||
|
+
|
||||||
|
# Find tools for the target.
|
||||||
|
if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
|
||||||
|
tmp_ac_tool_prefix="$ac_tool_prefix"
|
||||||
|
diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
|
||||||
|
index 136287cf1bf..61108f05429 100644
|
||||||
|
--- a/util/bash-completion.d/Makefile.am
|
||||||
|
+++ b/util/bash-completion.d/Makefile.am
|
||||||
|
@@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)
|
||||||
|
|
||||||
|
CLEANFILES = $(bash_completion_script) config.log
|
||||||
|
|
||||||
|
-bashcompletiondir = $(sysconfdir)/bash_completion.d
|
||||||
|
bashcompletion_DATA = $(bash_completion_script)
|
||||||
|
|
||||||
|
$(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
|
||||||
@ -0,0 +1,140 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Fri, 5 Sep 2014 10:07:04 -0400
|
||||||
|
Subject: [PATCH] Allow "fallback" to include entries by title, not just
|
||||||
|
number.
|
||||||
|
|
||||||
|
Resolves: rhbz#1026084
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/normal/menu.c | 85 +++++++++++++++++++++++++++++++++----------------
|
||||||
|
1 file changed, 58 insertions(+), 27 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
||||||
|
index 8397886fa05..d7a222e681b 100644
|
||||||
|
--- a/grub-core/normal/menu.c
|
||||||
|
+++ b/grub-core/normal/menu.c
|
||||||
|
@@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int
|
||||||
|
+menuentry_eq (const char *id, const char *spec)
|
||||||
|
+{
|
||||||
|
+ const char *ptr1, *ptr2;
|
||||||
|
+ ptr1 = id;
|
||||||
|
+ ptr2 = spec;
|
||||||
|
+ while (1)
|
||||||
|
+ {
|
||||||
|
+ if (*ptr2 == '>' && ptr2[1] != '>' && *ptr1 == 0)
|
||||||
|
+ return ptr2 - spec;
|
||||||
|
+ if (*ptr2 == '>' && ptr2[1] != '>')
|
||||||
|
+ return 0;
|
||||||
|
+ if (*ptr2 == '>')
|
||||||
|
+ ptr2++;
|
||||||
|
+ if (*ptr1 != *ptr2)
|
||||||
|
+ return 0;
|
||||||
|
+ if (*ptr1 == 0)
|
||||||
|
+ return ptr1 - id;
|
||||||
|
+ ptr1++;
|
||||||
|
+ ptr2++;
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* Get the first entry number from the value of the environment variable NAME,
|
||||||
|
which is a space-separated list of non-negative integers. The entry number
|
||||||
|
which is returned is stripped from the value of NAME. If no entry number
|
||||||
|
can be found, -1 is returned. */
|
||||||
|
static int
|
||||||
|
-get_and_remove_first_entry_number (const char *name)
|
||||||
|
+get_and_remove_first_entry_number (grub_menu_t menu, const char *name)
|
||||||
|
{
|
||||||
|
const char *val, *tail;
|
||||||
|
int entry;
|
||||||
|
+ int sz = 0;
|
||||||
|
|
||||||
|
val = grub_env_get (name);
|
||||||
|
if (! val)
|
||||||
|
@@ -181,9 +206,39 @@ get_and_remove_first_entry_number (const char *name)
|
||||||
|
|
||||||
|
entry = (int) grub_strtoul (val, &tail, 0);
|
||||||
|
|
||||||
|
+ if (grub_errno == GRUB_ERR_BAD_NUMBER)
|
||||||
|
+ {
|
||||||
|
+ /* See if the variable matches the title of a menu entry. */
|
||||||
|
+ grub_menu_entry_t e = menu->entry_list;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ for (i = 0; e; i++)
|
||||||
|
+ {
|
||||||
|
+ sz = menuentry_eq (e->title, val);
|
||||||
|
+ if (sz < 1)
|
||||||
|
+ sz = menuentry_eq (e->id, val);
|
||||||
|
+
|
||||||
|
+ if (sz >= 1)
|
||||||
|
+ {
|
||||||
|
+ entry = i;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ e = e->next;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (sz > 0)
|
||||||
|
+ grub_errno = GRUB_ERR_NONE;
|
||||||
|
+
|
||||||
|
+ if (! e)
|
||||||
|
+ entry = -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (grub_errno == GRUB_ERR_NONE)
|
||||||
|
{
|
||||||
|
- /* Skip whitespace to find the next digit. */
|
||||||
|
+ if (sz > 0)
|
||||||
|
+ tail += sz;
|
||||||
|
+
|
||||||
|
+ /* Skip whitespace to find the next entry. */
|
||||||
|
while (*tail && grub_isspace (*tail))
|
||||||
|
tail++;
|
||||||
|
grub_env_set (name, tail);
|
||||||
|
@@ -346,7 +401,7 @@ grub_menu_execute_with_fallback (grub_menu_t menu,
|
||||||
|
grub_menu_execute_entry (entry, 1);
|
||||||
|
|
||||||
|
/* Deal with fallback entries. */
|
||||||
|
- while ((fallback_entry = get_and_remove_first_entry_number ("fallback"))
|
||||||
|
+ while ((fallback_entry = get_and_remove_first_entry_number (menu, "fallback"))
|
||||||
|
>= 0)
|
||||||
|
{
|
||||||
|
grub_print_error ();
|
||||||
|
@@ -464,30 +519,6 @@ grub_menu_register_viewer (struct grub_menu_viewer *viewer)
|
||||||
|
viewers = viewer;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int
|
||||||
|
-menuentry_eq (const char *id, const char *spec)
|
||||||
|
-{
|
||||||
|
- const char *ptr1, *ptr2;
|
||||||
|
- ptr1 = id;
|
||||||
|
- ptr2 = spec;
|
||||||
|
- while (1)
|
||||||
|
- {
|
||||||
|
- if (*ptr2 == '>' && ptr2[1] != '>' && *ptr1 == 0)
|
||||||
|
- return 1;
|
||||||
|
- if (*ptr2 == '>' && ptr2[1] != '>')
|
||||||
|
- return 0;
|
||||||
|
- if (*ptr2 == '>')
|
||||||
|
- ptr2++;
|
||||||
|
- if (*ptr1 != *ptr2)
|
||||||
|
- return 0;
|
||||||
|
- if (*ptr1 == 0)
|
||||||
|
- return 1;
|
||||||
|
- ptr1++;
|
||||||
|
- ptr2++;
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-
|
||||||
|
/* Get the entry number from the variable NAME. */
|
||||||
|
static int
|
||||||
|
get_entry_number (grub_menu_t menu, const char *name)
|
||||||
@ -0,0 +1,267 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Wed, 26 Feb 2014 21:49:12 -0500
|
||||||
|
Subject: [PATCH] Make "exit" take a return code.
|
||||||
|
|
||||||
|
This adds "exit" with a return code. With this patch, any "exit"
|
||||||
|
command /may/ include a return code, and on platforms that support
|
||||||
|
returning with an exit status, we will do so. By default we return the
|
||||||
|
same exit status we did before this patch.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/commands/minicmd.c | 20 ++++++++++++++++----
|
||||||
|
grub-core/kern/efi/efi.c | 9 +++++++--
|
||||||
|
grub-core/kern/emu/main.c | 2 +-
|
||||||
|
grub-core/kern/emu/misc.c | 5 +++--
|
||||||
|
grub-core/kern/i386/coreboot/init.c | 2 +-
|
||||||
|
grub-core/kern/i386/qemu/init.c | 2 +-
|
||||||
|
grub-core/kern/ieee1275/init.c | 2 +-
|
||||||
|
grub-core/kern/mips/arc/init.c | 2 +-
|
||||||
|
grub-core/kern/mips/loongson/init.c | 2 +-
|
||||||
|
grub-core/kern/mips/qemu_mips/init.c | 2 +-
|
||||||
|
grub-core/kern/misc.c | 11 ++++++++++-
|
||||||
|
grub-core/kern/uboot/init.c | 6 +++---
|
||||||
|
grub-core/kern/xen/init.c | 2 +-
|
||||||
|
include/grub/misc.h | 2 +-
|
||||||
|
14 files changed, 48 insertions(+), 21 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
|
||||||
|
index fa498931ed2..2bd3ac76f2d 100644
|
||||||
|
--- a/grub-core/commands/minicmd.c
|
||||||
|
+++ b/grub-core/commands/minicmd.c
|
||||||
|
@@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
}
|
||||||
|
|
||||||
|
/* exit */
|
||||||
|
-static grub_err_t __attribute__ ((noreturn))
|
||||||
|
+static grub_err_t
|
||||||
|
grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
- int argc __attribute__ ((unused)),
|
||||||
|
- char *argv[] __attribute__ ((unused)))
|
||||||
|
+ int argc, char *argv[])
|
||||||
|
{
|
||||||
|
- grub_exit ();
|
||||||
|
+ int retval = -1;
|
||||||
|
+ unsigned long n;
|
||||||
|
+
|
||||||
|
+ if (argc < 0 || argc > 1)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
|
||||||
|
+
|
||||||
|
+ if (argc == 1)
|
||||||
|
+ {
|
||||||
|
+ n = grub_strtoul (argv[0], 0, 10);
|
||||||
|
+ if (n != ~0UL)
|
||||||
|
+ retval = n;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_exit (retval);
|
||||||
|
/* Not reached. */
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
|
||||||
|
index 8cff7be0289..05d8237a9b2 100644
|
||||||
|
--- a/grub-core/kern/efi/efi.c
|
||||||
|
+++ b/grub-core/kern/efi/efi.c
|
||||||
|
@@ -165,11 +165,16 @@ grub_reboot (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int retval)
|
||||||
|
{
|
||||||
|
+ int rc = GRUB_EFI_LOAD_ERROR;
|
||||||
|
+
|
||||||
|
+ if (retval == 0)
|
||||||
|
+ rc = GRUB_EFI_SUCCESS;
|
||||||
|
+
|
||||||
|
grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
|
||||||
|
efi_call_4 (grub_efi_system_table->boot_services->exit,
|
||||||
|
- grub_efi_image_handle, GRUB_EFI_SUCCESS, 0, 0);
|
||||||
|
+ grub_efi_image_handle, rc, 0, 0);
|
||||||
|
for (;;) ;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
|
||||||
|
index 425bb960347..55ea5a11ccd 100644
|
||||||
|
--- a/grub-core/kern/emu/main.c
|
||||||
|
+++ b/grub-core/kern/emu/main.c
|
||||||
|
@@ -67,7 +67,7 @@ grub_reboot (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int retval __attribute__((unused)))
|
||||||
|
{
|
||||||
|
grub_reboot ();
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
|
||||||
|
index dfd8a8ec488..0ff13bcaf8c 100644
|
||||||
|
--- a/grub-core/kern/emu/misc.c
|
||||||
|
+++ b/grub-core/kern/emu/misc.c
|
||||||
|
@@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...)
|
||||||
|
|
||||||
|
#if !defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+__attribute__ ((noreturn))
|
||||||
|
+grub_exit (int rc)
|
||||||
|
{
|
||||||
|
- exit (1);
|
||||||
|
+ exit (rc < 0 ? 1 : rc);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
|
||||||
|
index 3314f027fec..36f9134b7b7 100644
|
||||||
|
--- a/grub-core/kern/i386/coreboot/init.c
|
||||||
|
+++ b/grub-core/kern/i386/coreboot/init.c
|
||||||
|
@@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
|
||||||
|
extern grub_uint8_t _edata[];
|
||||||
|
|
||||||
|
void __attribute__ ((noreturn))
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
/* We can't use grub_fatal() in this function. This would create an infinite
|
||||||
|
loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */
|
||||||
|
diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
|
||||||
|
index 271b6fbfabd..9fafe98f015 100644
|
||||||
|
--- a/grub-core/kern/i386/qemu/init.c
|
||||||
|
+++ b/grub-core/kern/i386/qemu/init.c
|
||||||
|
@@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
|
||||||
|
extern grub_uint8_t _edata[];
|
||||||
|
|
||||||
|
void __attribute__ ((noreturn))
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
/* We can't use grub_fatal() in this function. This would create an infinite
|
||||||
|
loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */
|
||||||
|
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
|
||||||
|
index d483e35eed2..e71d1584164 100644
|
||||||
|
--- a/grub-core/kern/ieee1275/init.c
|
||||||
|
+++ b/grub-core/kern/ieee1275/init.c
|
||||||
|
@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
grub_ieee1275_exit ();
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
|
||||||
|
index 2ed3ff3191e..5c40c34078d 100644
|
||||||
|
--- a/grub-core/kern/mips/arc/init.c
|
||||||
|
+++ b/grub-core/kern/mips/arc/init.c
|
||||||
|
@@ -276,7 +276,7 @@ grub_halt (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
GRUB_ARC_FIRMWARE_VECTOR->exit ();
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
|
||||||
|
index 7b96531b983..dff598ca7b0 100644
|
||||||
|
--- a/grub-core/kern/mips/loongson/init.c
|
||||||
|
+++ b/grub-core/kern/mips/loongson/init.c
|
||||||
|
@@ -304,7 +304,7 @@ grub_halt (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
grub_halt ();
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
|
||||||
|
index be88b77d22d..8b6c55ffc01 100644
|
||||||
|
--- a/grub-core/kern/mips/qemu_mips/init.c
|
||||||
|
+++ b/grub-core/kern/mips/qemu_mips/init.c
|
||||||
|
@@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
grub_halt ();
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
||||||
|
index 3af336ee227..63b586d09cb 100644
|
||||||
|
--- a/grub-core/kern/misc.c
|
||||||
|
+++ b/grub-core/kern/misc.c
|
||||||
|
@@ -1209,9 +1209,18 @@ grub_abort (void)
|
||||||
|
grub_getkey ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- grub_exit ();
|
||||||
|
+ grub_exit (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined (__clang__) && !defined (GRUB_UTIL)
|
||||||
|
+/* clang emits references to abort(). */
|
||||||
|
+void __attribute__ ((noreturn))
|
||||||
|
+abort (void)
|
||||||
|
+{
|
||||||
|
+ grub_abort ();
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
void
|
||||||
|
grub_fatal (const char *fmt, ...)
|
||||||
|
{
|
||||||
|
diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
|
||||||
|
index 3e338645c57..be2a5be1d07 100644
|
||||||
|
--- a/grub-core/kern/uboot/init.c
|
||||||
|
+++ b/grub-core/kern/uboot/init.c
|
||||||
|
@@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
|
||||||
|
static unsigned long timer_start;
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc)
|
||||||
|
{
|
||||||
|
- grub_uboot_return (0);
|
||||||
|
+ grub_uboot_return (rc < 0 ? 1 : rc);
|
||||||
|
}
|
||||||
|
|
||||||
|
static grub_uint64_t
|
||||||
|
@@ -78,7 +78,7 @@ grub_machine_init (void)
|
||||||
|
if (!ver)
|
||||||
|
{
|
||||||
|
/* Don't even have a console to log errors to... */
|
||||||
|
- grub_exit ();
|
||||||
|
+ grub_exit (-1);
|
||||||
|
}
|
||||||
|
else if (ver > API_SIG_VERSION)
|
||||||
|
{
|
||||||
|
diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
|
||||||
|
index 782ca72952a..708b060f324 100644
|
||||||
|
--- a/grub-core/kern/xen/init.c
|
||||||
|
+++ b/grub-core/kern/xen/init.c
|
||||||
|
@@ -584,7 +584,7 @@ grub_machine_init (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-grub_exit (void)
|
||||||
|
+grub_exit (int rc __attribute__((unused)))
|
||||||
|
{
|
||||||
|
struct sched_shutdown arg;
|
||||||
|
|
||||||
|
diff --git a/include/grub/misc.h b/include/grub/misc.h
|
||||||
|
index 7d2b5519690..fd18e6320b8 100644
|
||||||
|
--- a/include/grub/misc.h
|
||||||
|
+++ b/include/grub/misc.h
|
||||||
|
@@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
|
||||||
|
char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
|
||||||
|
__attribute__ ((format (GNU_PRINTF, 1, 2))) WARN_UNUSED_RESULT;
|
||||||
|
char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) WARN_UNUSED_RESULT;
|
||||||
|
-void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
|
||||||
|
+void EXPORT_FUNC(grub_exit) (int rc) __attribute__ ((noreturn));
|
||||||
|
grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
|
||||||
|
grub_uint64_t d,
|
||||||
|
grub_uint64_t *r);
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 7 Dec 2015 14:20:49 -0500
|
||||||
|
Subject: [PATCH] Make efi machines load an env block from a variable
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/Makefile.core.def | 1 +
|
||||||
|
grub-core/kern/efi/init.c | 36 +++++++++++++++++++++++++++++++++++-
|
||||||
|
2 files changed, 36 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
||||||
|
index 45d3edaa4dc..c865a08b027 100644
|
||||||
|
--- a/grub-core/Makefile.core.def
|
||||||
|
+++ b/grub-core/Makefile.core.def
|
||||||
|
@@ -207,6 +207,7 @@ kernel = {
|
||||||
|
efi = kern/efi/acpi.c;
|
||||||
|
efi = kern/efi/sb.c;
|
||||||
|
efi = kern/lockdown.c;
|
||||||
|
+ efi = lib/envblk.c;
|
||||||
|
i386_coreboot = kern/i386/pc/acpi.c;
|
||||||
|
i386_multiboot = kern/i386/pc/acpi.c;
|
||||||
|
i386_coreboot = kern/acpi.c;
|
||||||
|
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
|
||||||
|
index 7facacf09c7..6d39bd3ad29 100644
|
||||||
|
--- a/grub-core/kern/efi/init.c
|
||||||
|
+++ b/grub-core/kern/efi/init.c
|
||||||
|
@@ -27,8 +27,11 @@
|
||||||
|
#include <grub/env.h>
|
||||||
|
#include <grub/mm.h>
|
||||||
|
#include <grub/kernel.h>
|
||||||
|
+
|
||||||
|
#include <grub/stack_protector.h>
|
||||||
|
|
||||||
|
+#include <grub/lib/envblk.h>
|
||||||
|
+
|
||||||
|
#ifdef GRUB_STACK_PROTECTOR
|
||||||
|
|
||||||
|
static grub_efi_guid_t rng_protocol_guid = GRUB_EFI_RNG_PROTOCOL_GUID;
|
||||||
|
@@ -82,6 +85,36 @@ stack_protector_init (void)
|
||||||
|
|
||||||
|
grub_addr_t grub_modbase;
|
||||||
|
|
||||||
|
+#define GRUB_EFI_GRUB_VARIABLE_GUID \
|
||||||
|
+ { 0x91376aff, 0xcba6, 0x42be, \
|
||||||
|
+ { 0x94, 0x9d, 0x06, 0xfd, 0xe8, 0x11, 0x28, 0xe8 } \
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+/* Helper for grub_efi_env_init */
|
||||||
|
+static int
|
||||||
|
+set_var (const char *name, const char *value,
|
||||||
|
+ void *whitelist __attribute__((__unused__)))
|
||||||
|
+{
|
||||||
|
+ grub_env_set (name, value);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+grub_efi_env_init (void)
|
||||||
|
+{
|
||||||
|
+ grub_efi_guid_t efi_grub_guid = GRUB_EFI_GRUB_VARIABLE_GUID;
|
||||||
|
+ struct grub_envblk envblk_s = { NULL, 0 };
|
||||||
|
+ grub_envblk_t envblk = &envblk_s;
|
||||||
|
+
|
||||||
|
+ grub_efi_get_variable ("GRUB_ENV", &efi_grub_guid, &envblk_s.size,
|
||||||
|
+ (void **) &envblk_s.buf);
|
||||||
|
+ if (!envblk_s.buf || envblk_s.size < 1)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ grub_envblk_iterate (envblk, NULL, set_var);
|
||||||
|
+ grub_free (envblk_s.buf);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
grub_efi_init (void)
|
||||||
|
{
|
||||||
|
@@ -108,10 +141,11 @@ grub_efi_init (void)
|
||||||
|
efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer,
|
||||||
|
0, 0, 0, NULL);
|
||||||
|
|
||||||
|
+ grub_efi_env_init ();
|
||||||
|
grub_efidisk_init ();
|
||||||
|
}
|
||||||
|
|
||||||
|
-void (*grub_efi_net_config) (grub_efi_handle_t hnd,
|
||||||
|
+void (*grub_efi_net_config) (grub_efi_handle_t hnd,
|
||||||
|
char **device,
|
||||||
|
char **path);
|
||||||
|
|
||||||
@ -0,0 +1,151 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Hamzy <hamzy@us.ibm.com>
|
||||||
|
Date: Wed, 28 Mar 2012 14:46:41 -0500
|
||||||
|
Subject: [PATCH] Migrate PPC from Yaboot to Grub2
|
||||||
|
|
||||||
|
Add configuration support for serial terminal consoles. This will set the
|
||||||
|
maximum screen size so that text is not overwritten.
|
||||||
|
---
|
||||||
|
Makefile.util.def | 7 +++
|
||||||
|
util/grub.d/20_ppc_terminfo.in | 114 +++++++++++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 121 insertions(+)
|
||||||
|
create mode 100644 util/grub.d/20_ppc_terminfo.in
|
||||||
|
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index f8b356cc1fa..2c9b283a230 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -508,6 +508,13 @@ script = {
|
||||||
|
condition = COND_HOST_LINUX;
|
||||||
|
};
|
||||||
|
|
||||||
|
+script = {
|
||||||
|
+ name = '20_ppc_terminfo';
|
||||||
|
+ common = util/grub.d/20_ppc_terminfo.in;
|
||||||
|
+ installdir = grubconf;
|
||||||
|
+ condition = COND_HOST_LINUX;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
script = {
|
||||||
|
name = '30_os-prober';
|
||||||
|
common = util/grub.d/30_os-prober.in;
|
||||||
|
diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..10d66586820
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub.d/20_ppc_terminfo.in
|
||||||
|
@@ -0,0 +1,114 @@
|
||||||
|
+#! /bin/sh
|
||||||
|
+set -e
|
||||||
|
+
|
||||||
|
+# grub-mkconfig helper script.
|
||||||
|
+# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
||||||
|
+#
|
||||||
|
+# GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+# it under the terms of the GNU General Public License as published by
|
||||||
|
+# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+# (at your option) any later version.
|
||||||
|
+#
|
||||||
|
+# GRUB 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 General Public License for more details.
|
||||||
|
+#
|
||||||
|
+# You should have received a copy of the GNU General Public License
|
||||||
|
+# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+
|
||||||
|
+prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
+bindir=@bindir@
|
||||||
|
+libdir=@libdir@
|
||||||
|
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
|
||||||
|
+
|
||||||
|
+export TEXTDOMAIN=@PACKAGE@
|
||||||
|
+export TEXTDOMAINDIR=@localedir@
|
||||||
|
+
|
||||||
|
+X=80
|
||||||
|
+Y=24
|
||||||
|
+TERMINAL=ofconsole
|
||||||
|
+
|
||||||
|
+argument () {
|
||||||
|
+ opt=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ if test $# -eq 0; then
|
||||||
|
+ echo "$0: option requires an argument -- '$opt'" 1>&2
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+ echo $1
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+check_terminfo () {
|
||||||
|
+
|
||||||
|
+ while test $# -gt 0
|
||||||
|
+ do
|
||||||
|
+ option=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ case "$option" in
|
||||||
|
+ terminfo | TERMINFO)
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ -g)
|
||||||
|
+ NEWXY=`argument $option "$@"`
|
||||||
|
+ NEWX=`echo $NEWXY | cut -d x -f 1`
|
||||||
|
+ NEWY=`echo $NEWXY | cut -d x -f 2`
|
||||||
|
+
|
||||||
|
+ if [ ${NEWX} -ge 80 ] ; then
|
||||||
|
+ X=${NEWX}
|
||||||
|
+ else
|
||||||
|
+ echo "Warning: ${NEWX} is less than the minimum size of 80"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ ${NEWY} -ge 24 ] ; then
|
||||||
|
+ Y=${NEWY}
|
||||||
|
+ else
|
||||||
|
+ echo "Warning: ${NEWY} is less than the minimum size of 24"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ shift
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ *)
|
||||||
|
+# # accept console or ofconsole
|
||||||
|
+# if [ "$option" != "console" -a "$option" != "ofconsole" ] ; then
|
||||||
|
+# echo "Error: GRUB_TERMINFO unknown console: $option"
|
||||||
|
+# exit 1
|
||||||
|
+# fi
|
||||||
|
+# # perfer console
|
||||||
|
+# TERMINAL=console
|
||||||
|
+ # accept ofconsole
|
||||||
|
+ if [ "$option" != "ofconsole" ] ; then
|
||||||
|
+ echo "Error: GRUB_TERMINFO unknown console: $option"
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+ # perfer console
|
||||||
|
+ TERMINAL=ofconsole
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+if ! uname -m | grep -q ppc ; then
|
||||||
|
+ exit 0
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ "x${GRUB_TERMINFO}" != "x" ] ; then
|
||||||
|
+ F1=`echo ${GRUB_TERMINFO} | cut -d " " -f 1`
|
||||||
|
+
|
||||||
|
+ if [ "${F1}" != "terminfo" ] ; then
|
||||||
|
+ echo "Error: GRUB_TERMINFO is set to \"${GRUB_TERMINFO}\" The first word should be terminfo."
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ check_terminfo ${GRUB_TERMINFO}
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+cat << EOF
|
||||||
|
+ terminfo -g ${X}x${Y} ${TERMINAL}
|
||||||
|
+EOF
|
||||||
@ -0,0 +1,78 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
||||||
|
Date: Wed, 19 Sep 2012 21:22:55 -0300
|
||||||
|
Subject: [PATCH] Add fw_path variable (revised)
|
||||||
|
|
||||||
|
This patch makes grub look for its config file on efi where the app was
|
||||||
|
found. It was originally written by Matthew Garrett, and adapted to fix the
|
||||||
|
"No modules are loaded on grub2 network boot" issue:
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=857936
|
||||||
|
---
|
||||||
|
grub-core/kern/main.c | 13 ++++++-------
|
||||||
|
grub-core/normal/main.c | 25 ++++++++++++++++++++++++-
|
||||||
|
2 files changed, 30 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
|
||||||
|
index 73967e2f5b0..d1de9fa6873 100644
|
||||||
|
--- a/grub-core/kern/main.c
|
||||||
|
+++ b/grub-core/kern/main.c
|
||||||
|
@@ -128,16 +128,15 @@ grub_set_prefix_and_root (void)
|
||||||
|
|
||||||
|
grub_machine_get_bootlocation (&fwdevice, &fwpath);
|
||||||
|
|
||||||
|
- if (fwdevice)
|
||||||
|
+ if (fwdevice && fwpath)
|
||||||
|
{
|
||||||
|
- char *cmdpath;
|
||||||
|
+ char *fw_path;
|
||||||
|
|
||||||
|
- cmdpath = grub_xasprintf ("(%s)%s", fwdevice, fwpath ? : "");
|
||||||
|
- if (cmdpath)
|
||||||
|
+ fw_path = grub_xasprintf ("(%s)/%s", fwdevice, fwpath);
|
||||||
|
+ if (fw_path)
|
||||||
|
{
|
||||||
|
- grub_env_set ("cmdpath", cmdpath);
|
||||||
|
- grub_env_export ("cmdpath");
|
||||||
|
- grub_free (cmdpath);
|
||||||
|
+ grub_env_set ("fw_path", fw_path);
|
||||||
|
+ grub_free (fw_path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index 70614de1565..62571e6dfcc 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
/* Guess the config filename. It is necessary to make CONFIG static,
|
||||||
|
so that it won't get broken by longjmp. */
|
||||||
|
char *config;
|
||||||
|
- const char *prefix;
|
||||||
|
+ const char *prefix, *fw_path;
|
||||||
|
+
|
||||||
|
+ fw_path = grub_env_get ("fw_path");
|
||||||
|
+ if (fw_path)
|
||||||
|
+ {
|
||||||
|
+ config = grub_xasprintf ("%s/grub.cfg", fw_path);
|
||||||
|
+ if (config)
|
||||||
|
+ {
|
||||||
|
+ grub_file_t file;
|
||||||
|
+
|
||||||
|
+ file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
||||||
|
+ if (file)
|
||||||
|
+ {
|
||||||
|
+ grub_file_close (file);
|
||||||
|
+ grub_enter_normal_mode (config);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ /* Ignore all errors. */
|
||||||
|
+ grub_errno = 0;
|
||||||
|
+ }
|
||||||
|
+ grub_free (config);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
prefix = grub_env_get ("prefix");
|
||||||
|
if (prefix)
|
||||||
@ -0,0 +1,173 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 1 Oct 2012 13:24:37 -0400
|
||||||
|
Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested.
|
||||||
|
|
||||||
|
Don't munge raw spaces when we're doing our cmdline escaping (#923374)
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/commands/wildcard.c | 16 +++++++++++++++-
|
||||||
|
grub-core/lib/cmdline.c | 25 +++++++++++++++++++++++--
|
||||||
|
grub-core/script/execute.c | 43 +++++++++++++++++++++++++++++++++++++------
|
||||||
|
3 files changed, 75 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
|
||||||
|
index cc3290311f0..8f67a4be7f0 100644
|
||||||
|
--- a/grub-core/commands/wildcard.c
|
||||||
|
+++ b/grub-core/commands/wildcard.c
|
||||||
|
@@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename)
|
||||||
|
return ctx.found;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int
|
||||||
|
+is_hex(char c)
|
||||||
|
+{
|
||||||
|
+ return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void
|
||||||
|
unescape (char *out, const char *in, const char *end)
|
||||||
|
{
|
||||||
|
@@ -496,7 +502,15 @@ unescape (char *out, const char *in, const char *end)
|
||||||
|
|
||||||
|
for (optr = out, iptr = in; iptr < end;)
|
||||||
|
{
|
||||||
|
- if (*iptr == '\\' && iptr + 1 < end)
|
||||||
|
+ if (*iptr == '\\' && iptr + 3 < end && iptr[1] == 'x' && is_hex(iptr[2]) && is_hex(iptr[3]))
|
||||||
|
+ {
|
||||||
|
+ *optr++ = *iptr++;
|
||||||
|
+ *optr++ = *iptr++;
|
||||||
|
+ *optr++ = *iptr++;
|
||||||
|
+ *optr++ = *iptr++;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ else if (*iptr == '\\' && iptr + 1 < end)
|
||||||
|
{
|
||||||
|
*optr++ = iptr[1];
|
||||||
|
iptr += 2;
|
||||||
|
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
|
||||||
|
index ed0b149dca5..8e2294d8ff6 100644
|
||||||
|
--- a/grub-core/lib/cmdline.c
|
||||||
|
+++ b/grub-core/lib/cmdline.c
|
||||||
|
@@ -20,6 +20,12 @@
|
||||||
|
#include <grub/lib/cmdline.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
|
+static int
|
||||||
|
+is_hex(char c)
|
||||||
|
+{
|
||||||
|
+ return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static unsigned int check_arg (char *c, int *has_space)
|
||||||
|
{
|
||||||
|
int space = 0;
|
||||||
|
@@ -27,7 +33,13 @@ static unsigned int check_arg (char *c, int *has_space)
|
||||||
|
|
||||||
|
while (*c)
|
||||||
|
{
|
||||||
|
- if (*c == '\\' || *c == '\'' || *c == '"')
|
||||||
|
+ if (*c == '\\' && *(c+1) == 'x' && is_hex(*(c+2)) && is_hex(*(c+3)))
|
||||||
|
+ {
|
||||||
|
+ size += 4;
|
||||||
|
+ c += 4;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ else if (*c == '\\' || *c == '\'' || *c == '"')
|
||||||
|
size++;
|
||||||
|
else if (*c == ' ')
|
||||||
|
space = 1;
|
||||||
|
@@ -86,7 +98,16 @@ grub_create_loader_cmdline (int argc, char *argv[], char *buf,
|
||||||
|
|
||||||
|
while (*c)
|
||||||
|
{
|
||||||
|
- if (*c == '\\' || *c == '\'' || *c == '"')
|
||||||
|
+ if (*c == '\\' && *(c+1) == 'x' &&
|
||||||
|
+ is_hex(*(c+2)) && is_hex(*(c+3)))
|
||||||
|
+ {
|
||||||
|
+ *buf++ = *c++;
|
||||||
|
+ *buf++ = *c++;
|
||||||
|
+ *buf++ = *c++;
|
||||||
|
+ *buf++ = *c++;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ else if (*c == '\\' || *c == '\'' || *c == '"')
|
||||||
|
*buf++ = '\\';
|
||||||
|
|
||||||
|
*buf++ = *c;
|
||||||
|
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
|
||||||
|
index ad80399246a..0c6dd9c5201 100644
|
||||||
|
--- a/grub-core/script/execute.c
|
||||||
|
+++ b/grub-core/script/execute.c
|
||||||
|
@@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;
|
||||||
|
/* Wildcard translator for GRUB script. */
|
||||||
|
struct grub_script_wildcard_translator *grub_wildcard_translator;
|
||||||
|
|
||||||
|
+static int
|
||||||
|
+is_hex(char c)
|
||||||
|
+{
|
||||||
|
+ return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static char*
|
||||||
|
wildcard_escape (const char *s)
|
||||||
|
{
|
||||||
|
@@ -72,7 +78,15 @@ wildcard_escape (const char *s)
|
||||||
|
i = 0;
|
||||||
|
while ((ch = *s++))
|
||||||
|
{
|
||||||
|
- if (ch == '*' || ch == '\\' || ch == '?')
|
||||||
|
+ if (ch == '\\' && s[0] == 'x' && is_hex(s[1]) && is_hex(s[2]))
|
||||||
|
+ {
|
||||||
|
+ p[i++] = ch;
|
||||||
|
+ p[i++] = *s++;
|
||||||
|
+ p[i++] = *s++;
|
||||||
|
+ p[i++] = *s++;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ else if (ch == '*' || ch == '\\' || ch == '?')
|
||||||
|
p[i++] = '\\';
|
||||||
|
p[i++] = ch;
|
||||||
|
}
|
||||||
|
@@ -96,7 +110,14 @@ wildcard_unescape (const char *s)
|
||||||
|
i = 0;
|
||||||
|
while ((ch = *s++))
|
||||||
|
{
|
||||||
|
- if (ch == '\\')
|
||||||
|
+ if (ch == '\\' && s[0] == 'x' && is_hex(s[1]) && is_hex(s[2]))
|
||||||
|
+ {
|
||||||
|
+ p[i++] = '\\';
|
||||||
|
+ p[i++] = *s++;
|
||||||
|
+ p[i++] = *s++;
|
||||||
|
+ p[i++] = *s++;
|
||||||
|
+ }
|
||||||
|
+ else if (ch == '\\')
|
||||||
|
p[i++] = *s++;
|
||||||
|
else
|
||||||
|
p[i++] = ch;
|
||||||
|
@@ -398,10 +419,20 @@ parse_string (const char *str,
|
||||||
|
switch (*ptr)
|
||||||
|
{
|
||||||
|
case '\\':
|
||||||
|
- escaped = !escaped;
|
||||||
|
- if (!escaped && put)
|
||||||
|
- *(put++) = '\\';
|
||||||
|
- ptr++;
|
||||||
|
+ if (!escaped && put && *(ptr+1) == 'x' && is_hex(*(ptr+2)) && is_hex(*(ptr+3)))
|
||||||
|
+ {
|
||||||
|
+ *(put++) = *ptr++;
|
||||||
|
+ *(put++) = *ptr++;
|
||||||
|
+ *(put++) = *ptr++;
|
||||||
|
+ *(put++) = *ptr++;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ escaped = !escaped;
|
||||||
|
+ if (!escaped && put)
|
||||||
|
+ *(put++) = '\\';
|
||||||
|
+ ptr++;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case '$':
|
||||||
|
if (escaped)
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,68 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 14 Jan 2014 13:12:23 -0500
|
||||||
|
Subject: [PATCH] Add devicetree loading
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
|
||||||
|
Switch to use APM Mustang device tree, for hardware testing.
|
||||||
|
|
||||||
|
Signed-off-by: David A. Marlin <d.marlin@redhat.com>
|
||||||
|
|
||||||
|
Use the default device tree from the grub default file
|
||||||
|
|
||||||
|
instead of hardcoding a value.
|
||||||
|
|
||||||
|
Signed-off-by: David A. Marlin <dmarlin@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub-mkconfig.in | 3 ++-
|
||||||
|
util/grub.d/10_linux.in | 15 +++++++++++++++
|
||||||
|
2 files changed, 17 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index d3e879b8e5c..8ea2315ebc2 100644
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -248,7 +248,8 @@ export GRUB_DEFAULT \
|
||||||
|
GRUB_ENABLE_CRYPTODISK \
|
||||||
|
GRUB_BADRAM \
|
||||||
|
GRUB_OS_PROBER_SKIP_LIST \
|
||||||
|
- GRUB_DISABLE_SUBMENU
|
||||||
|
+ GRUB_DISABLE_SUBMENU \
|
||||||
|
+ GRUB_DEFAULT_DTB
|
||||||
|
|
||||||
|
if test "x${grub_cfg}" != "x"; then
|
||||||
|
rm -f "${grub_cfg}.new"
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index e8b01c0d0c7..dc75a1c30bf 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -153,6 +153,13 @@ EOF
|
||||||
|
sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
echo '$(echo "$message" | grub_quote)'
|
||||||
|
initrd $(echo $initrd_path)
|
||||||
|
+EOF
|
||||||
|
+ fi
|
||||||
|
+ if test -n "${fdt}" ; then
|
||||||
|
+ message="$(gettext_printf "Loading fdt ...")"
|
||||||
|
+ sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
+ echo '$(echo "$message" | grub_quote)'
|
||||||
|
+ devicetree ${rel_dirname}/${fdt}
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
@@ -236,6 +243,14 @@ while [ "x$list" != "x" ] ; do
|
||||||
|
gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
+ fdt=
|
||||||
|
+ for i in "dtb-${version}" "dtb-${alt_version}"; do
|
||||||
|
+ if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
|
||||||
|
+ fdt="${i}/${GRUB_DEFAULT_DTB}"
|
||||||
|
+ break
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
config=
|
||||||
|
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
||||||
|
if test -e "${i}" ; then
|
||||||
@ -0,0 +1,176 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Wed, 15 May 2013 13:30:20 -0400
|
||||||
|
Subject: [PATCH] Don't write messages to the screen
|
||||||
|
|
||||||
|
Writing messages to the screen before the menus or boot splash
|
||||||
|
happens so quickly it looks like something is wrong and isn't
|
||||||
|
very appealing.
|
||||||
|
---
|
||||||
|
grub-core/gettext/gettext.c | 25 +++++--------------------
|
||||||
|
grub-core/kern/main.c | 5 -----
|
||||||
|
grub-core/boot/i386/pc/boot.S | 3 ---
|
||||||
|
grub-core/boot/i386/pc/diskboot.S | 5 -----
|
||||||
|
util/grub.d/10_linux.in | 7 -------
|
||||||
|
5 files changed, 5 insertions(+), 40 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
|
||||||
|
index 4d02e62c109..84d520cd494 100644
|
||||||
|
--- a/grub-core/gettext/gettext.c
|
||||||
|
+++ b/grub-core/gettext/gettext.c
|
||||||
|
@@ -434,16 +434,12 @@ static char *
|
||||||
|
grub_gettext_env_write_lang (struct grub_env_var *var
|
||||||
|
__attribute__ ((unused)), const char *val)
|
||||||
|
{
|
||||||
|
- grub_err_t err;
|
||||||
|
+ grub_err_t __attribute__((__unused__)) err;
|
||||||
|
err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
|
||||||
|
grub_env_get ("prefix"));
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
|
||||||
|
err = grub_gettext_init_ext (&secondary_context, val,
|
||||||
|
grub_env_get ("secondary_locale_dir"), 0);
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
|
||||||
|
return grub_strdup (val);
|
||||||
|
}
|
||||||
|
@@ -451,23 +447,19 @@ grub_gettext_env_write_lang (struct grub_env_var *var
|
||||||
|
void
|
||||||
|
grub_gettext_reread_prefix (const char *val)
|
||||||
|
{
|
||||||
|
- grub_err_t err;
|
||||||
|
+ grub_err_t __attribute__((__unused__)) err;
|
||||||
|
err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"),
|
||||||
|
grub_env_get ("locale_dir"),
|
||||||
|
val);
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *
|
||||||
|
read_main (struct grub_env_var *var
|
||||||
|
__attribute__ ((unused)), const char *val)
|
||||||
|
{
|
||||||
|
- grub_err_t err;
|
||||||
|
+ grub_err_t __attribute__((__unused__)) err;
|
||||||
|
err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
|
||||||
|
grub_env_get ("prefix"));
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
return grub_strdup (val);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -475,12 +467,9 @@ static char *
|
||||||
|
read_secondary (struct grub_env_var *var
|
||||||
|
__attribute__ ((unused)), const char *val)
|
||||||
|
{
|
||||||
|
- grub_err_t err;
|
||||||
|
+ grub_err_t __attribute__((__unused__)) err;
|
||||||
|
err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
|
||||||
|
0);
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
-
|
||||||
|
return grub_strdup (val);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -500,18 +489,14 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
GRUB_MOD_INIT (gettext)
|
||||||
|
{
|
||||||
|
const char *lang;
|
||||||
|
- grub_err_t err;
|
||||||
|
+ grub_err_t __attribute__((__unused__)) err;
|
||||||
|
|
||||||
|
lang = grub_env_get ("lang");
|
||||||
|
|
||||||
|
err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"),
|
||||||
|
grub_env_get ("prefix"));
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
err = grub_gettext_init_ext (&secondary_context, lang,
|
||||||
|
grub_env_get ("secondary_locale_dir"), 0);
|
||||||
|
- if (err)
|
||||||
|
- grub_print_error ();
|
||||||
|
|
||||||
|
grub_register_variable_hook ("locale_dir", NULL, read_main);
|
||||||
|
grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
|
||||||
|
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
|
||||||
|
index d1de9fa6873..48058d983ce 100644
|
||||||
|
--- a/grub-core/kern/main.c
|
||||||
|
+++ b/grub-core/kern/main.c
|
||||||
|
@@ -269,11 +269,6 @@ grub_main (void)
|
||||||
|
|
||||||
|
grub_boot_time ("After machine init.");
|
||||||
|
|
||||||
|
- /* Hello. */
|
||||||
|
- grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
|
||||||
|
- grub_printf ("Welcome to GRUB!\n\n");
|
||||||
|
- grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
|
||||||
|
-
|
||||||
|
/* Init verifiers API. */
|
||||||
|
grub_verifiers_init ();
|
||||||
|
|
||||||
|
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
|
||||||
|
index 2bd0b2d2866..ea167fe1206 100644
|
||||||
|
--- a/grub-core/boot/i386/pc/boot.S
|
||||||
|
+++ b/grub-core/boot/i386/pc/boot.S
|
||||||
|
@@ -249,9 +249,6 @@ real_start:
|
||||||
|
/* save drive reference first thing! */
|
||||||
|
pushw %dx
|
||||||
|
|
||||||
|
- /* print a notification message on the screen */
|
||||||
|
- MSG(notification_string)
|
||||||
|
-
|
||||||
|
/* set %si to the disk address packet */
|
||||||
|
movw $disk_address_packet, %si
|
||||||
|
|
||||||
|
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
|
||||||
|
index c1addc0df29..68d31de0c4c 100644
|
||||||
|
--- a/grub-core/boot/i386/pc/diskboot.S
|
||||||
|
+++ b/grub-core/boot/i386/pc/diskboot.S
|
||||||
|
@@ -50,11 +50,6 @@ _start:
|
||||||
|
/* save drive reference first thing! */
|
||||||
|
pushw %dx
|
||||||
|
|
||||||
|
- /* print a notification message on the screen */
|
||||||
|
- pushw %si
|
||||||
|
- MSG(notification_string)
|
||||||
|
- popw %si
|
||||||
|
-
|
||||||
|
/* this sets up for the first run through "bootloop" */
|
||||||
|
movw $LOCAL(firstlist), %di
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index dc75a1c30bf..ad2ac4b078d 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -138,27 +138,20 @@ linux_entry ()
|
||||||
|
fi
|
||||||
|
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
||||||
|
fi
|
||||||
|
- message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
||||||
|
sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
- echo '$(echo "$message" | grub_quote)'
|
||||||
|
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
||||||
|
EOF
|
||||||
|
if test -n "${initrd}" ; then
|
||||||
|
- # TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
||||||
|
- message="$(gettext_printf "Loading initial ramdisk ...")"
|
||||||
|
initrd_path=
|
||||||
|
for i in ${initrd}; do
|
||||||
|
initrd_path="${initrd_path} ${rel_dirname}/${i}"
|
||||||
|
done
|
||||||
|
sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
- echo '$(echo "$message" | grub_quote)'
|
||||||
|
initrd $(echo $initrd_path)
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
if test -n "${fdt}" ; then
|
||||||
|
- message="$(gettext_printf "Loading fdt ...")"
|
||||||
|
sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
- echo '$(echo "$message" | grub_quote)'
|
||||||
|
devicetree ${rel_dirname}/${fdt}
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Wed, 15 May 2013 13:53:48 -0400
|
||||||
|
Subject: [PATCH] Don't print GNU GRUB header
|
||||||
|
|
||||||
|
No one cares.
|
||||||
|
---
|
||||||
|
grub-core/normal/main.c | 8 +++++---
|
||||||
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index 7ca2e5400b1..5d5f7b539f5 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -208,15 +208,16 @@ read_config_file (const char *config)
|
||||||
|
/* Initialize the screen. */
|
||||||
|
void
|
||||||
|
grub_normal_init_page (struct grub_term_output *term,
|
||||||
|
- int y)
|
||||||
|
+ int y __attribute__((__unused__)))
|
||||||
|
{
|
||||||
|
+ grub_term_cls (term);
|
||||||
|
+
|
||||||
|
+#if 0
|
||||||
|
grub_ssize_t msg_len;
|
||||||
|
int posx;
|
||||||
|
char *msg_formatted;
|
||||||
|
grub_uint32_t *unicode_msg;
|
||||||
|
grub_uint32_t *last_position;
|
||||||
|
-
|
||||||
|
- grub_term_cls (term);
|
||||||
|
|
||||||
|
msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
|
||||||
|
if (!msg_formatted)
|
||||||
|
@@ -241,6 +242,7 @@ grub_normal_init_page (struct grub_term_output *term,
|
||||||
|
grub_putcode ('\n', term);
|
||||||
|
grub_putcode ('\n', term);
|
||||||
|
grub_free (unicode_msg);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Wed, 15 May 2013 17:49:45 -0400
|
||||||
|
Subject: [PATCH] Don't add '*' to highlighted row
|
||||||
|
|
||||||
|
It is already highlighted.
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index 18240e76cea..65deafda531 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
|
||||||
|
unicode_title[i] = ' ';
|
||||||
|
|
||||||
|
if (data->geo.num_entries > 1)
|
||||||
|
- grub_putcode (highlight ? '*' : ' ', data->term);
|
||||||
|
+ grub_putcode (' ', data->term);
|
||||||
|
|
||||||
|
grub_print_ucs4_menu (unicode_title,
|
||||||
|
unicode_title + len,
|
||||||
@ -0,0 +1,68 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Fri, 7 Jun 2013 11:09:04 -0400
|
||||||
|
Subject: [PATCH] Message string cleanups
|
||||||
|
|
||||||
|
Make use of terminology consistent. Remove jargon.
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 21 +++++++++------------
|
||||||
|
1 file changed, 9 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index 65deafda531..cc5837ed2b8 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
|
||||||
|
|
||||||
|
if (edit)
|
||||||
|
{
|
||||||
|
- ret += grub_print_message_indented_real (_("Minimum Emacs-like screen editing is \
|
||||||
|
-supported. TAB lists completions. Press Ctrl-x or F10 to boot, Ctrl-c or F2 for a \
|
||||||
|
-command-line or ESC to discard edits and return to the GRUB menu."),
|
||||||
|
+ ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
|
||||||
|
+command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
|
||||||
|
STANDARD_MARGIN, STANDARD_MARGIN,
|
||||||
|
term, dry_run);
|
||||||
|
}
|
||||||
|
@@ -167,8 +166,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
|
||||||
|
{
|
||||||
|
char *msg_translated;
|
||||||
|
|
||||||
|
- msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
|
||||||
|
- "entry is highlighted."),
|
||||||
|
+ msg_translated = grub_xasprintf (_("Use the %C and %C keys to change the "
|
||||||
|
+ "selection."),
|
||||||
|
GRUB_UNICODE_UPARROW,
|
||||||
|
GRUB_UNICODE_DOWNARROW);
|
||||||
|
if (!msg_translated)
|
||||||
|
@@ -181,17 +180,15 @@ command-line or ESC to discard edits and return to the GRUB menu."),
|
||||||
|
if (nested)
|
||||||
|
{
|
||||||
|
ret += grub_print_message_indented_real
|
||||||
|
- (_("Press enter to boot the selected OS, "
|
||||||
|
- "`e' to edit the commands before booting "
|
||||||
|
- "or `c' for a command-line. ESC to return previous menu."),
|
||||||
|
+ (_("Press 'e' to edit the selected item, "
|
||||||
|
+ "or 'c' for a command prompt. Press Escape to return to the previous menu."),
|
||||||
|
STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ret += grub_print_message_indented_real
|
||||||
|
- (_("Press enter to boot the selected OS, "
|
||||||
|
- "`e' to edit the commands before booting "
|
||||||
|
- "or `c' for a command-line."),
|
||||||
|
+ (_("Press 'e' to edit the selected item, "
|
||||||
|
+ "or 'c' for a command prompt."),
|
||||||
|
STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -443,7 +440,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
|
||||||
|
|| data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN)
|
||||||
|
msg_translated = grub_xasprintf (_("%ds"), timeout);
|
||||||
|
else
|
||||||
|
- msg_translated = grub_xasprintf (_("The highlighted entry will be executed automatically in %ds."), timeout);
|
||||||
|
+ msg_translated = grub_xasprintf (_("The selected entry will be started automatically in %ds."), timeout);
|
||||||
|
if (!msg_translated)
|
||||||
|
{
|
||||||
|
grub_print_error ();
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Fri, 7 Jun 2013 14:08:23 -0400
|
||||||
|
Subject: [PATCH] Fix border spacing now that we aren't displaying it
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index cc5837ed2b8..b49835a9af7 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,
|
||||||
|
int empty_lines = 1;
|
||||||
|
int version_msg = 1;
|
||||||
|
|
||||||
|
- geo->border = 1;
|
||||||
|
- geo->first_entry_x = 1 /* margin */ + 1 /* border */;
|
||||||
|
+ geo->border = 0;
|
||||||
|
+ geo->first_entry_x = 0 /* margin */ + 0 /* border */;
|
||||||
|
geo->entry_width = grub_term_width (term) - 5;
|
||||||
|
|
||||||
|
geo->first_entry_y = 2 /* two empty lines*/
|
||||||
|
- + 1 /* GNU GRUB version text */ + 1 /* top border */;
|
||||||
|
+ + 0 /* GNU GRUB version text */ + 1 /* top border */;
|
||||||
|
|
||||||
|
geo->timeout_lines = 2;
|
||||||
|
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Fri, 7 Jun 2013 14:08:49 -0400
|
||||||
|
Subject: [PATCH] Use the correct indentation for the term help text
|
||||||
|
|
||||||
|
That is consistent with the menu help text
|
||||||
|
---
|
||||||
|
grub-core/normal/main.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index 5d5f7b539f5..ec1cd257397 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -440,8 +440,8 @@ grub_normal_reader_init (int nested)
|
||||||
|
grub_normal_init_page (term, 1);
|
||||||
|
grub_term_setcursor (term, 1);
|
||||||
|
|
||||||
|
- if (grub_term_width (term) > 3 + STANDARD_MARGIN + 20)
|
||||||
|
- grub_print_message_indented (msg_formatted, 3, STANDARD_MARGIN, term);
|
||||||
|
+ if (grub_term_width (term) > 2 * STANDARD_MARGIN + 20)
|
||||||
|
+ grub_print_message_indented (msg_formatted, STANDARD_MARGIN, STANDARD_MARGIN, term);
|
||||||
|
else
|
||||||
|
grub_print_message_indented (msg_formatted, 0, 0, term);
|
||||||
|
grub_putcode ('\n', term);
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Fri, 7 Jun 2013 14:30:55 -0400
|
||||||
|
Subject: [PATCH] Indent menu entries
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index b49835a9af7..6a57376fa80 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
|
||||||
|
unicode_title[i] = ' ';
|
||||||
|
|
||||||
|
if (data->geo.num_entries > 1)
|
||||||
|
- grub_putcode (' ', data->term);
|
||||||
|
+ for (i = 0; i < STANDARD_MARGIN; i++)
|
||||||
|
+ grub_putcode (' ', data->term);
|
||||||
|
|
||||||
|
grub_print_ucs4_menu (unicode_title,
|
||||||
|
unicode_title + len,
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Fri, 7 Jun 2013 14:59:36 -0400
|
||||||
|
Subject: [PATCH] Fix margins
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 8 +++-----
|
||||||
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index 6a57376fa80..cbd62f714cb 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,
|
||||||
|
int version_msg = 1;
|
||||||
|
|
||||||
|
geo->border = 0;
|
||||||
|
- geo->first_entry_x = 0 /* margin */ + 0 /* border */;
|
||||||
|
- geo->entry_width = grub_term_width (term) - 5;
|
||||||
|
+ geo->first_entry_x = 0; /* no margin */
|
||||||
|
+ geo->entry_width = grub_term_width (term) - 1;
|
||||||
|
|
||||||
|
- geo->first_entry_y = 2 /* two empty lines*/
|
||||||
|
- + 0 /* GNU GRUB version text */ + 1 /* top border */;
|
||||||
|
+ geo->first_entry_y = 3; /* three empty lines*/
|
||||||
|
|
||||||
|
geo->timeout_lines = 2;
|
||||||
|
|
||||||
|
/* 3 lines for timeout message and bottom margin. 2 lines for the border. */
|
||||||
|
geo->num_entries = grub_term_height (term) - geo->first_entry_y
|
||||||
|
- - 1 /* bottom border */
|
||||||
|
- 1 /* empty line before info message*/
|
||||||
|
- geo->timeout_lines /* timeout */
|
||||||
|
- 1 /* empty final line */;
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Fri, 21 Jun 2013 14:44:08 -0400
|
||||||
|
Subject: [PATCH] Use -2 instead of -1 for our right-hand margin, so
|
||||||
|
linewrapping works (#976643).
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index cbd62f714cb..26e9e82042a 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,
|
||||||
|
|
||||||
|
geo->border = 0;
|
||||||
|
geo->first_entry_x = 0; /* no margin */
|
||||||
|
- geo->entry_width = grub_term_width (term) - 1;
|
||||||
|
+ geo->entry_width = grub_term_width (term) - 2;
|
||||||
|
|
||||||
|
geo->first_entry_y = 3; /* three empty lines*/
|
||||||
|
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 28 Oct 2013 10:09:27 -0400
|
||||||
|
Subject: [PATCH] Enable pager by default. (#985860)
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub.d/00_header.in | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||||
|
index 93a90233ead..858b526c925 100644
|
||||||
|
--- a/util/grub.d/00_header.in
|
||||||
|
+++ b/util/grub.d/00_header.in
|
||||||
|
@@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_
|
||||||
|
if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
|
||||||
|
|
||||||
|
cat << EOF
|
||||||
|
+set pager=1
|
||||||
|
+
|
||||||
|
if [ -s \$prefix/grubenv ]; then
|
||||||
|
load_env
|
||||||
|
fi
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 28 Oct 2013 10:13:27 -0400
|
||||||
|
Subject: [PATCH] F10 doesn't work on serial, so don't tell the user to hit it
|
||||||
|
(#987443)
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index 26e9e82042a..4895ffe7d1d 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
|
||||||
|
|
||||||
|
if (edit)
|
||||||
|
{
|
||||||
|
- ret += grub_print_message_indented_real (_("Press Ctrl-x or F10 to start, Ctrl-c or F2 for a \
|
||||||
|
+ ret += grub_print_message_indented_real (_("Press Ctrl-x to start, Ctrl-c for a \
|
||||||
|
command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
|
||||||
|
STANDARD_MARGIN, STANDARD_MARGIN,
|
||||||
|
term, dry_run);
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 14 Mar 2011 14:27:42 -0400
|
||||||
|
Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
|
||||||
|
|
||||||
|
---
|
||||||
|
util/grub.d/10_linux.in | 4 ++--
|
||||||
|
util/grub.d/20_linux_xen.in | 4 ++--
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index ad2ac4b078d..4fc58c83304 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
|
||||||
|
CLASS="--class gnu-linux --class gnu --class os"
|
||||||
|
|
||||||
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||||
|
- OS=GNU/Linux
|
||||||
|
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
||||||
|
else
|
||||||
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
||||||
|
+ OS="${GRUB_DISTRIBUTOR}"
|
||||||
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
||||||
|
index 3b1f4704921..ada20775a14 100644
|
||||||
|
--- a/util/grub.d/20_linux_xen.in
|
||||||
|
+++ b/util/grub.d/20_linux_xen.in
|
||||||
|
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
|
||||||
|
CLASS="--class gnu-linux --class gnu --class os --class xen"
|
||||||
|
|
||||||
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||||
|
- OS=GNU/Linux
|
||||||
|
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
||||||
|
else
|
||||||
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
||||||
|
+ OS="${GRUB_DISTRIBUTOR}"
|
||||||
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
||||||
|
fi
|
||||||
|
|
||||||
@ -0,0 +1,71 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Wed, 15 May 2013 16:47:33 -0400
|
||||||
|
Subject: [PATCH] Don't draw a border around the menu
|
||||||
|
|
||||||
|
It looks cleaner without it.
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 43 -------------------------------------------
|
||||||
|
1 file changed, 43 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index 4895ffe7d1d..e72ed438ba3 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
|
||||||
|
grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void
|
||||||
|
-draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
|
||||||
|
-{
|
||||||
|
- int i;
|
||||||
|
-
|
||||||
|
- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
|
||||||
|
-
|
||||||
|
- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
||||||
|
- geo->first_entry_y - 1 });
|
||||||
|
- grub_putcode (GRUB_UNICODE_CORNER_UL, term);
|
||||||
|
- for (i = 0; i < geo->entry_width + 1; i++)
|
||||||
|
- grub_putcode (GRUB_UNICODE_HLINE, term);
|
||||||
|
- grub_putcode (GRUB_UNICODE_CORNER_UR, term);
|
||||||
|
-
|
||||||
|
- for (i = 0; i < geo->num_entries; i++)
|
||||||
|
- {
|
||||||
|
- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
||||||
|
- geo->first_entry_y + i });
|
||||||
|
- grub_putcode (GRUB_UNICODE_VLINE, term);
|
||||||
|
- grub_term_gotoxy (term,
|
||||||
|
- (struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
|
||||||
|
- geo->first_entry_y + i });
|
||||||
|
- grub_putcode (GRUB_UNICODE_VLINE, term);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- grub_term_gotoxy (term,
|
||||||
|
- (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
||||||
|
- geo->first_entry_y - 1 + geo->num_entries + 1 });
|
||||||
|
- grub_putcode (GRUB_UNICODE_CORNER_LL, term);
|
||||||
|
- for (i = 0; i < geo->entry_width + 1; i++)
|
||||||
|
- grub_putcode (GRUB_UNICODE_HLINE, term);
|
||||||
|
- grub_putcode (GRUB_UNICODE_CORNER_LR, term);
|
||||||
|
-
|
||||||
|
- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
|
||||||
|
-
|
||||||
|
- grub_term_gotoxy (term,
|
||||||
|
- (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
||||||
|
- (geo->first_entry_y - 1 + geo->num_entries
|
||||||
|
- + GRUB_TERM_MARGIN + 1) });
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
static int
|
||||||
|
print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
|
||||||
|
{
|
||||||
|
@@ -406,8 +365,6 @@ grub_menu_init_page (int nested, int edit,
|
||||||
|
|
||||||
|
grub_term_normal_color = grub_color_menu_normal;
|
||||||
|
grub_term_highlight_color = grub_color_menu_highlight;
|
||||||
|
- if (geo->border)
|
||||||
|
- draw_border (term, geo);
|
||||||
|
grub_term_normal_color = old_color_normal;
|
||||||
|
grub_term_highlight_color = old_color_highlight;
|
||||||
|
geo->timeout_y = geo->first_entry_y + geo->num_entries
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||||
|
Date: Fri, 7 Jun 2013 10:52:32 -0400
|
||||||
|
Subject: [PATCH] Use the standard margin for the timeout string
|
||||||
|
|
||||||
|
So that it aligns with the other messages
|
||||||
|
---
|
||||||
|
grub-core/normal/menu_text.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
||||||
|
index e72ed438ba3..ca135624356 100644
|
||||||
|
--- a/grub-core/normal/menu_text.c
|
||||||
|
+++ b/grub-core/normal/menu_text.c
|
||||||
|
@@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,
|
||||||
|
if (bottom_message)
|
||||||
|
{
|
||||||
|
grub_term_gotoxy (term,
|
||||||
|
- (struct grub_term_coordinate) { GRUB_TERM_MARGIN,
|
||||||
|
+ (struct grub_term_coordinate) { STANDARD_MARGIN,
|
||||||
|
geo->timeout_y });
|
||||||
|
|
||||||
|
print_message (nested, edit, term, 0);
|
||||||
|
@@ -407,14 +407,14 @@ menu_text_print_timeout (int timeout, void *dataptr)
|
||||||
|
if (data->timeout_msg == TIMEOUT_UNKNOWN)
|
||||||
|
{
|
||||||
|
data->timeout_msg = grub_print_message_indented_real (msg_translated,
|
||||||
|
- 3, 1, data->term, 1)
|
||||||
|
+ STANDARD_MARGIN, 1, data->term, 1)
|
||||||
|
<= data->geo.timeout_lines ? TIMEOUT_NORMAL : TIMEOUT_TERSE;
|
||||||
|
if (data->timeout_msg == TIMEOUT_TERSE)
|
||||||
|
{
|
||||||
|
grub_free (msg_translated);
|
||||||
|
msg_translated = grub_xasprintf (_("%ds"), timeout);
|
||||||
|
if (grub_term_width (data->term) < 10)
|
||||||
|
- data->timeout_msg = TIMEOUT_TERSE_NO_MARGIN;
|
||||||
|
+ data->timeout_msg = STANDARD_MARGIN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||||
|
Date: Mon, 13 Jan 2014 21:50:59 -0500
|
||||||
|
Subject: [PATCH] Add .eh_frame to list of relocations stripped
|
||||||
|
|
||||||
|
---
|
||||||
|
conf/Makefile.common | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/conf/Makefile.common b/conf/Makefile.common
|
||||||
|
index 2a1a886f6d5..191b1a70c6b 100644
|
||||||
|
--- a/conf/Makefile.common
|
||||||
|
+++ b/conf/Makefile.common
|
||||||
|
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
|
||||||
|
LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
|
||||||
|
CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
|
||||||
|
CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
|
||||||
|
-STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
|
||||||
|
+STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
|
||||||
|
|
||||||
|
CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
|
||||||
|
LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 11 Feb 2014 11:14:50 -0500
|
||||||
|
Subject: [PATCH] Don't require a password to boot entries generated by
|
||||||
|
grub-mkconfig.
|
||||||
|
|
||||||
|
When we set a password, we just want that to mean you can't /edit/ an entry.
|
||||||
|
|
||||||
|
Resolves: rhbz#1030176
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub.d/10_linux.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index 4fc58c83304..635d2fe0cd3 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
|
||||||
|
export TEXTDOMAIN=@PACKAGE@
|
||||||
|
export TEXTDOMAINDIR="@localedir@"
|
||||||
|
|
||||||
|
-CLASS="--class gnu-linux --class gnu --class os"
|
||||||
|
+CLASS="--class gnu-linux --class gnu --class os --unrestricted"
|
||||||
|
|
||||||
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||||
|
OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 18 Feb 2014 09:37:49 -0500
|
||||||
|
Subject: [PATCH] Don't emit "Booting ..." message.
|
||||||
|
|
||||||
|
UI team still hates this stuff, so we're disabling it for RHEL 7.
|
||||||
|
|
||||||
|
Resolves: rhbz#1023142
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/normal/menu.c | 4 +++-
|
||||||
|
grub-core/normal/menu_entry.c | 3 ---
|
||||||
|
2 files changed, 3 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
||||||
|
index d7a222e681b..37d753d8081 100644
|
||||||
|
--- a/grub-core/normal/menu.c
|
||||||
|
+++ b/grub-core/normal/menu.c
|
||||||
|
@@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
|
||||||
|
|
||||||
|
/* Callback invoked immediately before a menu entry is executed. */
|
||||||
|
static void
|
||||||
|
-notify_booting (grub_menu_entry_t entry,
|
||||||
|
+notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
|
||||||
|
void *userdata __attribute__((unused)))
|
||||||
|
{
|
||||||
|
+#if 0
|
||||||
|
grub_printf (" ");
|
||||||
|
grub_printf_ (N_("Booting `%s'"), entry->title);
|
||||||
|
grub_printf ("\n\n");
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Callback invoked when a default menu entry executed because of a timeout
|
||||||
|
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
|
||||||
|
index 50eef918cf6..de64a367c4e 100644
|
||||||
|
--- a/grub-core/normal/menu_entry.c
|
||||||
|
+++ b/grub-core/normal/menu_entry.c
|
||||||
|
@@ -1176,9 +1176,6 @@ run (struct screen *screen)
|
||||||
|
char *dummy[1] = { NULL };
|
||||||
|
|
||||||
|
grub_cls ();
|
||||||
|
- grub_printf (" ");
|
||||||
|
- grub_printf_ (N_("Booting a command list"));
|
||||||
|
- grub_printf ("\n\n");
|
||||||
|
|
||||||
|
errs_before = grub_err_printed_errors;
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,41 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
||||||
|
Date: Wed, 19 Feb 2014 15:58:43 -0500
|
||||||
|
Subject: [PATCH] use fw_path prefix when fallback searching for grub config
|
||||||
|
|
||||||
|
When PXE booting via UEFI firmware, grub was searching for grub.cfg
|
||||||
|
in the fw_path directory where the grub application was found. If
|
||||||
|
that didn't exist, a fallback search would look for config file names
|
||||||
|
based on MAC and IP address. However, the search would look in the
|
||||||
|
prefix directory which may not be the same fw_path. This patch
|
||||||
|
changes that behavior to use the fw_path directory for the fallback
|
||||||
|
search. Only if fw_path is NULL will the prefix directory be searched.
|
||||||
|
|
||||||
|
Signed-off-by: Mark Salter <msalter@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/normal/main.c | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index ec1cd257397..d85f7598d23 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -349,7 +349,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
char *config;
|
||||||
|
const char *prefix, *fw_path;
|
||||||
|
|
||||||
|
- fw_path = grub_env_get ("fw_path");
|
||||||
|
+ prefix = fw_path = grub_env_get ("fw_path");
|
||||||
|
if (fw_path)
|
||||||
|
{
|
||||||
|
config = grub_xasprintf ("%s/grub.cfg", fw_path);
|
||||||
|
@@ -372,7 +372,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- prefix = grub_env_get ("prefix");
|
||||||
|
+ if (! prefix)
|
||||||
|
+ prefix = grub_env_get ("prefix");
|
||||||
|
if (prefix)
|
||||||
|
{
|
||||||
|
grub_size_t config_len;
|
||||||
@ -0,0 +1,127 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 8 Jul 2019 17:33:22 +0200
|
||||||
|
Subject: [PATCH] Try mac/guid/etc before grub.cfg on tftp config files.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/normal/main.c | 97 ++++++++++++++++++++++++++-----------------------
|
||||||
|
1 file changed, 51 insertions(+), 46 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index d85f7598d23..1e509fceb91 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -347,61 +347,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
/* Guess the config filename. It is necessary to make CONFIG static,
|
||||||
|
so that it won't get broken by longjmp. */
|
||||||
|
char *config;
|
||||||
|
- const char *prefix, *fw_path;
|
||||||
|
-
|
||||||
|
- prefix = fw_path = grub_env_get ("fw_path");
|
||||||
|
- if (fw_path)
|
||||||
|
- {
|
||||||
|
- config = grub_xasprintf ("%s/grub.cfg", fw_path);
|
||||||
|
- if (config)
|
||||||
|
- {
|
||||||
|
- grub_file_t file;
|
||||||
|
-
|
||||||
|
- file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
||||||
|
- if (file)
|
||||||
|
- {
|
||||||
|
- grub_file_close (file);
|
||||||
|
- grub_enter_normal_mode (config);
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- /* Ignore all errors. */
|
||||||
|
- grub_errno = 0;
|
||||||
|
- }
|
||||||
|
- grub_free (config);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
+ const char *prefix;
|
||||||
|
+ const char *net_search_cfg;
|
||||||
|
+ int disable_net_search = 0;
|
||||||
|
|
||||||
|
+ prefix = grub_env_get ("fw_path");
|
||||||
|
if (! prefix)
|
||||||
|
prefix = grub_env_get ("prefix");
|
||||||
|
+
|
||||||
|
+ net_search_cfg = grub_env_get ("feature_net_search_cfg");
|
||||||
|
+ if (net_search_cfg && net_search_cfg[0] == 'n')
|
||||||
|
+ disable_net_search = 1;
|
||||||
|
+
|
||||||
|
if (prefix)
|
||||||
|
{
|
||||||
|
- grub_size_t config_len;
|
||||||
|
- int disable_net_search = 0;
|
||||||
|
- const char *net_search_cfg;
|
||||||
|
-
|
||||||
|
- config_len = grub_strlen (prefix) +
|
||||||
|
- sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
||||||
|
- config = grub_malloc (config_len);
|
||||||
|
-
|
||||||
|
- if (!config)
|
||||||
|
- goto quit;
|
||||||
|
-
|
||||||
|
- grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
||||||
|
-
|
||||||
|
- net_search_cfg = grub_env_get ("feature_net_search_cfg");
|
||||||
|
- if (net_search_cfg && net_search_cfg[0] == 'n')
|
||||||
|
- disable_net_search = 1;
|
||||||
|
-
|
||||||
|
if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 &&
|
||||||
|
!disable_net_search)
|
||||||
|
- grub_net_search_config_file (config);
|
||||||
|
+ {
|
||||||
|
+ grub_size_t config_len;
|
||||||
|
+ config_len = grub_strlen (prefix) +
|
||||||
|
+ sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
||||||
|
+ config = grub_malloc (config_len);
|
||||||
|
|
||||||
|
- grub_enter_normal_mode (config);
|
||||||
|
- grub_free (config);
|
||||||
|
- }
|
||||||
|
+ if (! config)
|
||||||
|
+ goto quit;
|
||||||
|
+
|
||||||
|
+ grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
||||||
|
+
|
||||||
|
+ grub_net_search_configfile (config);
|
||||||
|
+
|
||||||
|
+ grub_enter_normal_mode (config);
|
||||||
|
+ grub_free (config);
|
||||||
|
+ config = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!config)
|
||||||
|
+ {
|
||||||
|
+ config = grub_xasprintf ("%s/grub.cfg", prefix);
|
||||||
|
+ if (config)
|
||||||
|
+ {
|
||||||
|
+ grub_file_t file;
|
||||||
|
+
|
||||||
|
+ file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
||||||
|
+ if (file)
|
||||||
|
+ {
|
||||||
|
+ grub_file_close (file);
|
||||||
|
+ grub_enter_normal_mode (config);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ /* Ignore all errors. */
|
||||||
|
+ grub_errno = 0;
|
||||||
|
+ }
|
||||||
|
+ grub_free (config);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
- grub_enter_normal_mode (0);
|
||||||
|
+ {
|
||||||
|
+ grub_enter_normal_mode (0);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
grub_enter_normal_mode (argv[0]);
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 4 Sep 2014 14:23:23 -0400
|
||||||
|
Subject: [PATCH] Generate OS and CLASS in 10_linux from /etc/os-release
|
||||||
|
|
||||||
|
This makes us use pretty names in the titles we generate in
|
||||||
|
grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.
|
||||||
|
|
||||||
|
Resolves: rhbz#996794
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub.d/10_linux.in | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index 635d2fe0cd3..fed73271478 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"
|
||||||
|
CLASS="--class gnu-linux --class gnu --class os --unrestricted"
|
||||||
|
|
||||||
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||||
|
- OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
||||||
|
+ OS="$(eval $(grep PRETTY_NAME /etc/os-release) ; echo ${PRETTY_NAME})"
|
||||||
|
+ CLASS="--class $(eval $(grep '^ID_LIKE=\|^ID=' /etc/os-release) ; [ -n "${ID_LIKE}" ] && echo ${ID_LIKE} || echo ${ID}) ${CLASS}"
|
||||||
|
else
|
||||||
|
OS="${GRUB_DISTRIBUTOR}"
|
||||||
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 4 Sep 2014 15:52:08 -0400
|
||||||
|
Subject: [PATCH] Minimize the sort ordering for .debug and -rescue- kernels.
|
||||||
|
|
||||||
|
Resolves: rhbz#1065360
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub-mkconfig_lib.in | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
||||||
|
index 301d1ac229a..0f6505bf3b6 100644
|
||||||
|
--- a/util/grub-mkconfig_lib.in
|
||||||
|
+++ b/util/grub-mkconfig_lib.in
|
||||||
|
@@ -253,6 +253,14 @@ version_test_gt ()
|
||||||
|
*.old:*.old) ;;
|
||||||
|
*.old:*) version_test_gt_a="`echo "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
|
||||||
|
*:*.old) version_test_gt_b="`echo "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;
|
||||||
|
+ *-rescue*:*-rescue*) ;;
|
||||||
|
+ *?debug:*?debug) ;;
|
||||||
|
+ *-rescue*:*?debug) return 1 ;;
|
||||||
|
+ *?debug:*-rescue*) return 0 ;;
|
||||||
|
+ *-rescue*:*) return 1 ;;
|
||||||
|
+ *:*-rescue*) return 0 ;;
|
||||||
|
+ *?debug:*) return 1 ;;
|
||||||
|
+ *:*?debug) return 0 ;;
|
||||||
|
esac
|
||||||
|
version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
|
||||||
|
return "$?"
|
||||||
@ -0,0 +1,222 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 9 Jul 2019 10:35:16 +0200
|
||||||
|
Subject: [PATCH] Try $prefix if $fw_path doesn't work.
|
||||||
|
|
||||||
|
Related: rhbz#1148652
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/kern/ieee1275/init.c | 28 +++++----
|
||||||
|
grub-core/net/net.c | 2 +-
|
||||||
|
grub-core/normal/main.c | 134 ++++++++++++++++++++---------------------
|
||||||
|
3 files changed, 82 insertions(+), 82 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
|
||||||
|
index e71d1584164..0cd2a627231 100644
|
||||||
|
--- a/grub-core/kern/ieee1275/init.c
|
||||||
|
+++ b/grub-core/kern/ieee1275/init.c
|
||||||
|
@@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path)
|
||||||
|
grub_free (canon);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- *device = grub_ieee1275_encode_devname (bootpath);
|
||||||
|
- grub_free (type);
|
||||||
|
-
|
||||||
|
- filename = grub_ieee1275_get_filename (bootpath);
|
||||||
|
- if (filename)
|
||||||
|
{
|
||||||
|
- char *lastslash = grub_strrchr (filename, '\\');
|
||||||
|
-
|
||||||
|
- /* Truncate at last directory. */
|
||||||
|
- if (lastslash)
|
||||||
|
+ filename = grub_ieee1275_get_filename (bootpath);
|
||||||
|
+ if (filename)
|
||||||
|
{
|
||||||
|
- *lastslash = '\0';
|
||||||
|
- grub_translate_ieee1275_path (filename);
|
||||||
|
+ char *lastslash = grub_strrchr (filename, '\\');
|
||||||
|
|
||||||
|
- *path = filename;
|
||||||
|
- }
|
||||||
|
+ /* Truncate at last directory. */
|
||||||
|
+ if (lastslash)
|
||||||
|
+ {
|
||||||
|
+ *lastslash = '\0';
|
||||||
|
+ grub_translate_ieee1275_path (filename);
|
||||||
|
+
|
||||||
|
+ *path = filename;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ *device = grub_ieee1275_encode_devname (bootpath);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ grub_free (type);
|
||||||
|
grub_free (bootpath);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
||||||
|
index 4d3eb5c1a52..0ef148f4adc 100644
|
||||||
|
--- a/grub-core/net/net.c
|
||||||
|
+++ b/grub-core/net/net.c
|
||||||
|
@@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config)
|
||||||
|
/* Remove the remaining minus sign at the end. */
|
||||||
|
config[config_len] = '\0';
|
||||||
|
|
||||||
|
- return GRUB_ERR_NONE;
|
||||||
|
+ return GRUB_ERR_FILE_NOT_FOUND;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct grub_preboot *fini_hnd;
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index 1e509fceb91..d5968797f4f 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -337,81 +337,79 @@ grub_enter_normal_mode (const char *config)
|
||||||
|
grub_boot_time ("Exiting normal mode");
|
||||||
|
}
|
||||||
|
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_try_normal (const char *variable)
|
||||||
|
+{
|
||||||
|
+ char *config;
|
||||||
|
+ const char *prefix;
|
||||||
|
+ grub_err_t err = GRUB_ERR_FILE_NOT_FOUND;
|
||||||
|
+ const char *net_search_cfg;
|
||||||
|
+ int disable_net_search = 0;
|
||||||
|
+
|
||||||
|
+ prefix = grub_env_get (variable);
|
||||||
|
+ if (!prefix)
|
||||||
|
+ return GRUB_ERR_FILE_NOT_FOUND;
|
||||||
|
+
|
||||||
|
+ net_search_cfg = grub_env_get ("feature_net_search_cfg");
|
||||||
|
+ if (net_search_cfg && net_search_cfg[0] == 'n')
|
||||||
|
+ disable_net_search = 1;
|
||||||
|
+
|
||||||
|
+ if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 &&
|
||||||
|
+ !disable_net_search)
|
||||||
|
+ {
|
||||||
|
+ grub_size_t config_len;
|
||||||
|
+ config_len = grub_strlen (prefix) +
|
||||||
|
+ sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
||||||
|
+ config = grub_malloc (config_len);
|
||||||
|
+
|
||||||
|
+ if (! config)
|
||||||
|
+ return GRUB_ERR_FILE_NOT_FOUND;
|
||||||
|
+
|
||||||
|
+ grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
||||||
|
+ err = grub_net_search_config_file (config);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (err != GRUB_ERR_NONE)
|
||||||
|
+ {
|
||||||
|
+ config = grub_xasprintf ("%s/grub.cfg", prefix);
|
||||||
|
+ if (config)
|
||||||
|
+ {
|
||||||
|
+ grub_file_t file;
|
||||||
|
+ file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
||||||
|
+ if (file)
|
||||||
|
+ {
|
||||||
|
+ grub_file_close (file);
|
||||||
|
+ err = GRUB_ERR_NONE;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (err == GRUB_ERR_NONE)
|
||||||
|
+ grub_enter_normal_mode (config);
|
||||||
|
+
|
||||||
|
+ grub_errno = 0;
|
||||||
|
+ grub_free (config);
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* Enter normal mode from rescue mode. */
|
||||||
|
static grub_err_t
|
||||||
|
grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
int argc, char *argv[])
|
||||||
|
{
|
||||||
|
- if (argc == 0)
|
||||||
|
- {
|
||||||
|
- /* Guess the config filename. It is necessary to make CONFIG static,
|
||||||
|
- so that it won't get broken by longjmp. */
|
||||||
|
- char *config;
|
||||||
|
- const char *prefix;
|
||||||
|
- const char *net_search_cfg;
|
||||||
|
- int disable_net_search = 0;
|
||||||
|
-
|
||||||
|
- prefix = grub_env_get ("fw_path");
|
||||||
|
- if (! prefix)
|
||||||
|
- prefix = grub_env_get ("prefix");
|
||||||
|
-
|
||||||
|
- net_search_cfg = grub_env_get ("feature_net_search_cfg");
|
||||||
|
- if (net_search_cfg && net_search_cfg[0] == 'n')
|
||||||
|
- disable_net_search = 1;
|
||||||
|
-
|
||||||
|
- if (prefix)
|
||||||
|
- {
|
||||||
|
- if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 &&
|
||||||
|
- !disable_net_search)
|
||||||
|
- {
|
||||||
|
- grub_size_t config_len;
|
||||||
|
- config_len = grub_strlen (prefix) +
|
||||||
|
- sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
||||||
|
- config = grub_malloc (config_len);
|
||||||
|
-
|
||||||
|
- if (! config)
|
||||||
|
- goto quit;
|
||||||
|
-
|
||||||
|
- grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
||||||
|
-
|
||||||
|
- grub_net_search_configfile (config);
|
||||||
|
-
|
||||||
|
- grub_enter_normal_mode (config);
|
||||||
|
- grub_free (config);
|
||||||
|
- config = NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (!config)
|
||||||
|
- {
|
||||||
|
- config = grub_xasprintf ("%s/grub.cfg", prefix);
|
||||||
|
- if (config)
|
||||||
|
- {
|
||||||
|
- grub_file_t file;
|
||||||
|
-
|
||||||
|
- file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
||||||
|
- if (file)
|
||||||
|
- {
|
||||||
|
- grub_file_close (file);
|
||||||
|
- grub_enter_normal_mode (config);
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- /* Ignore all errors. */
|
||||||
|
- grub_errno = 0;
|
||||||
|
- }
|
||||||
|
- grub_free (config);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- grub_enter_normal_mode (0);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
+ if (argc)
|
||||||
|
grub_enter_normal_mode (argv[0]);
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ /* Guess the config filename. */
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ err = grub_try_normal ("fw_path");
|
||||||
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
||||||
|
+ err = grub_try_normal ("prefix");
|
||||||
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
||||||
|
+ grub_enter_normal_mode (0);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
-quit:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,458 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Robert Marshall <rmarshall@redhat.com>
|
||||||
|
Date: Mon, 16 Mar 2015 14:14:19 -0400
|
||||||
|
Subject: [PATCH] Use Distribution Package Sort for grub2-mkconfig (#1124074)
|
||||||
|
|
||||||
|
Users reported that newly installed kernels on their systems installed
|
||||||
|
with grub-mkconfig would not appear on the grub boot list in order
|
||||||
|
starting with the most recent. Added an option for rpm-based systems to
|
||||||
|
use the rpm-sort library to sort kernels instead.
|
||||||
|
|
||||||
|
Resolves rhbz#1124074
|
||||||
|
|
||||||
|
Signed-off-by: Robert Marshall <rmarshall@redhat.com>
|
||||||
|
[pjones: fix --enable-rpm-sort configure option]
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
[thierry.vignaud: fix build with rpm-4.16]
|
||||||
|
Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
|
||||||
|
---
|
||||||
|
configure.ac | 38 +++++++
|
||||||
|
Makefile.util.def | 16 +++
|
||||||
|
util/grub-rpm-sort.c | 281 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
util/grub-mkconfig_lib.in | 11 +-
|
||||||
|
util/grub-rpm-sort.8 | 12 ++
|
||||||
|
5 files changed, 357 insertions(+), 1 deletion(-)
|
||||||
|
create mode 100644 util/grub-rpm-sort.c
|
||||||
|
create mode 100644 util/grub-rpm-sort.8
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index bec8535af70..fdcb452581c 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
|
||||||
|
grub_TRANSFORM([grub-mkrescue])
|
||||||
|
grub_TRANSFORM([grub-probe])
|
||||||
|
grub_TRANSFORM([grub-reboot])
|
||||||
|
+grub_TRANSFORM([grub-rpm-sort])
|
||||||
|
grub_TRANSFORM([grub-script-check])
|
||||||
|
grub_TRANSFORM([grub-set-default])
|
||||||
|
grub_TRANSFORM([grub-sparc64-setup])
|
||||||
|
@@ -95,6 +96,7 @@ grub_TRANSFORM([grub-mkrescue.1])
|
||||||
|
grub_TRANSFORM([grub-mkstandalone.3])
|
||||||
|
grub_TRANSFORM([grub-ofpathname.3])
|
||||||
|
grub_TRANSFORM([grub-probe.3])
|
||||||
|
+grub_TRANSFORM([grub-rpm-sort.8])
|
||||||
|
grub_TRANSFORM([grub-reboot.3])
|
||||||
|
grub_TRANSFORM([grub-render-label.3])
|
||||||
|
grub_TRANSFORM([grub-script-check.3])
|
||||||
|
@@ -1860,6 +1862,42 @@ fi
|
||||||
|
|
||||||
|
AC_SUBST([LIBDEVMAPPER])
|
||||||
|
|
||||||
|
+AC_ARG_ENABLE([rpm-sort],
|
||||||
|
+ [AS_HELP_STRING([--enable-rpm-sort],
|
||||||
|
+ [enable native rpm sorting of kernels in grub (default=guessed)])])
|
||||||
|
+if test x"$enable_rpm_sort" = xno ; then
|
||||||
|
+ rpm_sort_excuse="explicitly disabled"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test x"$rpm_sort_excuse" = x ; then
|
||||||
|
+ # Check for rpmlib header.
|
||||||
|
+ AC_CHECK_HEADER([rpm/rpmlib.h], [],
|
||||||
|
+ [rpm_sort_excuse="need rpm/rpmlib header"])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test x"$rpm_sort_excuse" = x ; then
|
||||||
|
+ # Check for rpm library.
|
||||||
|
+ AC_CHECK_LIB([rpm], [rpmvercmp], [],
|
||||||
|
+ [rpm_sort_excuse="rpmlib missing rpmvercmp"])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test x"$rpm_sort_excuse" = x ; then
|
||||||
|
+ LIBRPM="-lrpm";
|
||||||
|
+ AC_DEFINE([HAVE_RPM], [1],
|
||||||
|
+ [Define to 1 if you have the rpm library.])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test x"$LIBRPM" = x ; then
|
||||||
|
+ # Check for rpm library.
|
||||||
|
+ AC_CHECK_LIB([rpmio], [rpmvercmp], [],
|
||||||
|
+ [rpm_sort_excuse="rpmio missing rpmvercmp"])
|
||||||
|
+ LIBRPM="-lrpmio";
|
||||||
|
+ AC_DEFINE([HAVE_RPMIO], [1],
|
||||||
|
+ [Define to 1 if you have the rpm library.])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST([LIBRPM])
|
||||||
|
+
|
||||||
|
LIBGEOM=
|
||||||
|
if test x$host_kernel = xkfreebsd; then
|
||||||
|
AC_CHECK_LIB([geom], [geom_gettree], [],
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index 2c9b283a230..ba4cf4b29b0 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -703,6 +703,22 @@ program = {
|
||||||
|
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
||||||
|
};
|
||||||
|
|
||||||
|
+program = {
|
||||||
|
+ name = grub-rpm-sort;
|
||||||
|
+ mansection = 8;
|
||||||
|
+ installdir = sbin;
|
||||||
|
+
|
||||||
|
+ common = grub-core/kern/emu/misc.c;
|
||||||
|
+ common = grub-core/kern/emu/argp_common.c;
|
||||||
|
+ common = grub-core/osdep/init.c;
|
||||||
|
+ common = util/misc.c;
|
||||||
|
+ common = util/grub-rpm-sort.c;
|
||||||
|
+
|
||||||
|
+ ldadd = libgrubkern.a;
|
||||||
|
+ ldadd = grub-core/lib/gnulib/libgnu.a;
|
||||||
|
+ ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
script = {
|
||||||
|
name = grub-mkconfig;
|
||||||
|
common = util/grub-mkconfig.in;
|
||||||
|
diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..f33bd1ed568
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-rpm-sort.c
|
||||||
|
@@ -0,0 +1,281 @@
|
||||||
|
+#include <config.h>
|
||||||
|
+#include <grub/types.h>
|
||||||
|
+#include <grub/util/misc.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
+#include <errno.h>
|
||||||
|
+#include <assert.h>
|
||||||
|
+#include <argp.h>
|
||||||
|
+#include <rpm/rpmlib.h>
|
||||||
|
+
|
||||||
|
+static size_t
|
||||||
|
+read_file (const char *input, char **ret)
|
||||||
|
+{
|
||||||
|
+ FILE *in;
|
||||||
|
+ size_t s;
|
||||||
|
+ size_t sz = 2048;
|
||||||
|
+ size_t offset = 0;
|
||||||
|
+ char *text;
|
||||||
|
+
|
||||||
|
+ if (!strcmp(input, "-"))
|
||||||
|
+ in = stdin;
|
||||||
|
+ else
|
||||||
|
+ in = grub_util_fopen(input, "r");
|
||||||
|
+
|
||||||
|
+ text = xmalloc (sz);
|
||||||
|
+
|
||||||
|
+ if (!in)
|
||||||
|
+ grub_util_error (_("cannot open `%s': %s"), input, strerror (errno));
|
||||||
|
+
|
||||||
|
+ while ((s = fread (text + offset, 1, sz - offset, in)) != 0)
|
||||||
|
+ {
|
||||||
|
+ offset += s;
|
||||||
|
+ if (sz - offset == 0)
|
||||||
|
+ {
|
||||||
|
+ sz += 2048;
|
||||||
|
+ text = xrealloc (text, sz);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ text[offset] = '\0';
|
||||||
|
+ *ret = text;
|
||||||
|
+
|
||||||
|
+ if (in != stdin)
|
||||||
|
+ fclose(in);
|
||||||
|
+
|
||||||
|
+ return offset + 1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* returns name/version/release */
|
||||||
|
+/* NULL string pointer returned if nothing found */
|
||||||
|
+static void
|
||||||
|
+split_package_string (char *package_string, char **name,
|
||||||
|
+ char **version, char **release)
|
||||||
|
+{
|
||||||
|
+ char *package_version, *package_release;
|
||||||
|
+
|
||||||
|
+ /* Release */
|
||||||
|
+ package_release = strrchr (package_string, '-');
|
||||||
|
+
|
||||||
|
+ if (package_release != NULL)
|
||||||
|
+ *package_release++ = '\0';
|
||||||
|
+
|
||||||
|
+ *release = package_release;
|
||||||
|
+
|
||||||
|
+ /* Version */
|
||||||
|
+ package_version = strrchr(package_string, '-');
|
||||||
|
+
|
||||||
|
+ if (package_version != NULL)
|
||||||
|
+ *package_version++ = '\0';
|
||||||
|
+
|
||||||
|
+ *version = package_version;
|
||||||
|
+ /* Name */
|
||||||
|
+ *name = package_string;
|
||||||
|
+
|
||||||
|
+ /* Bubble up non-null values from release to name */
|
||||||
|
+ if (*name == NULL)
|
||||||
|
+ {
|
||||||
|
+ *name = (*version == NULL ? *release : *version);
|
||||||
|
+ *version = *release;
|
||||||
|
+ *release = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (*version == NULL)
|
||||||
|
+ {
|
||||||
|
+ *version = *release;
|
||||||
|
+ *release = NULL;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * package name-version-release comparator for qsort
|
||||||
|
+ * expects p, q which are pointers to character strings (char *)
|
||||||
|
+ * which will not be altered in this function
|
||||||
|
+ */
|
||||||
|
+static int
|
||||||
|
+package_version_compare (const void *p, const void *q)
|
||||||
|
+{
|
||||||
|
+ char *local_p, *local_q;
|
||||||
|
+ char *lhs_name, *lhs_version, *lhs_release;
|
||||||
|
+ char *rhs_name, *rhs_version, *rhs_release;
|
||||||
|
+ int vercmpflag = 0;
|
||||||
|
+
|
||||||
|
+ local_p = alloca (strlen (*(char * const *)p) + 1);
|
||||||
|
+ local_q = alloca (strlen (*(char * const *)q) + 1);
|
||||||
|
+
|
||||||
|
+ /* make sure these allocated */
|
||||||
|
+ assert (local_p);
|
||||||
|
+ assert (local_q);
|
||||||
|
+
|
||||||
|
+ strcpy (local_p, *(char * const *)p);
|
||||||
|
+ strcpy (local_q, *(char * const *)q);
|
||||||
|
+
|
||||||
|
+ split_package_string (local_p, &lhs_name, &lhs_version, &lhs_release);
|
||||||
|
+ split_package_string (local_q, &rhs_name, &rhs_version, &rhs_release);
|
||||||
|
+
|
||||||
|
+ /* Check Name and return if unequal */
|
||||||
|
+ vercmpflag = rpmvercmp ((lhs_name == NULL ? "" : lhs_name),
|
||||||
|
+ (rhs_name == NULL ? "" : rhs_name));
|
||||||
|
+ if (vercmpflag != 0)
|
||||||
|
+ return vercmpflag;
|
||||||
|
+
|
||||||
|
+ /* Check version and return if unequal */
|
||||||
|
+ vercmpflag = rpmvercmp ((lhs_version == NULL ? "" : lhs_version),
|
||||||
|
+ (rhs_version == NULL ? "" : rhs_version));
|
||||||
|
+ if (vercmpflag != 0)
|
||||||
|
+ return vercmpflag;
|
||||||
|
+
|
||||||
|
+ /* Check release and return the version compare value */
|
||||||
|
+ vercmpflag = rpmvercmp ((lhs_release == NULL ? "" : lhs_release),
|
||||||
|
+ (rhs_release == NULL ? "" : rhs_release));
|
||||||
|
+
|
||||||
|
+ return vercmpflag;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+add_input (const char *filename, char ***package_names, size_t *n_package_names)
|
||||||
|
+{
|
||||||
|
+ char *orig_input_buffer = NULL;
|
||||||
|
+ char *input_buffer;
|
||||||
|
+ char *position_of_newline;
|
||||||
|
+ char **names = *package_names;
|
||||||
|
+ char **new_names = NULL;
|
||||||
|
+ size_t n_names = *n_package_names;
|
||||||
|
+
|
||||||
|
+ if (!*package_names)
|
||||||
|
+ new_names = names = xmalloc (sizeof (char *) * 2);
|
||||||
|
+
|
||||||
|
+ if (read_file (filename, &orig_input_buffer) < 2)
|
||||||
|
+ {
|
||||||
|
+ if (new_names)
|
||||||
|
+ free (new_names);
|
||||||
|
+ if (orig_input_buffer)
|
||||||
|
+ free (orig_input_buffer);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ input_buffer = orig_input_buffer;
|
||||||
|
+ while (input_buffer && *input_buffer &&
|
||||||
|
+ (position_of_newline = strchrnul (input_buffer, '\n')))
|
||||||
|
+ {
|
||||||
|
+ size_t sz = position_of_newline - input_buffer;
|
||||||
|
+ char *new;
|
||||||
|
+
|
||||||
|
+ if (sz == 0)
|
||||||
|
+ {
|
||||||
|
+ input_buffer = position_of_newline + 1;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ new = xmalloc (sz+1);
|
||||||
|
+ strncpy (new, input_buffer, sz);
|
||||||
|
+ new[sz] = '\0';
|
||||||
|
+
|
||||||
|
+ names = xrealloc (names, sizeof (char *) * (n_names + 1));
|
||||||
|
+ names[n_names] = new;
|
||||||
|
+ n_names++;
|
||||||
|
+
|
||||||
|
+ /* move buffer ahead to next line */
|
||||||
|
+ input_buffer = position_of_newline + 1;
|
||||||
|
+ if (*position_of_newline == '\0')
|
||||||
|
+ input_buffer = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free (orig_input_buffer);
|
||||||
|
+
|
||||||
|
+ *package_names = names;
|
||||||
|
+ *n_package_names = n_names;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static char *
|
||||||
|
+help_filter (int key, const char *text, void *input __attribute__ ((unused)))
|
||||||
|
+{
|
||||||
|
+ return (char *)text;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static struct argp_option options[] = {
|
||||||
|
+ { 0, }
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct arguments
|
||||||
|
+{
|
||||||
|
+ size_t ninputs;
|
||||||
|
+ size_t input_max;
|
||||||
|
+ char **inputs;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static error_t
|
||||||
|
+argp_parser (int key, char *arg, struct argp_state *state)
|
||||||
|
+{
|
||||||
|
+ struct arguments *arguments = state->input;
|
||||||
|
+ switch (key)
|
||||||
|
+ {
|
||||||
|
+ case ARGP_KEY_ARG:
|
||||||
|
+ assert (arguments->ninputs < arguments->input_max);
|
||||||
|
+ arguments->inputs[arguments->ninputs++] = xstrdup (arg);
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ return ARGP_ERR_UNKNOWN;
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static struct argp argp = {
|
||||||
|
+ options, argp_parser, N_("[INPUT_FILES]"),
|
||||||
|
+ N_("Sort a list of strings in RPM version sort order."),
|
||||||
|
+ NULL, help_filter, NULL
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+main (int argc, char *argv[])
|
||||||
|
+{
|
||||||
|
+ struct arguments arguments;
|
||||||
|
+ char **package_names = NULL;
|
||||||
|
+ size_t n_package_names = 0;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ grub_util_host_init (&argc, &argv);
|
||||||
|
+
|
||||||
|
+ memset (&arguments, 0, sizeof (struct arguments));
|
||||||
|
+ arguments.input_max = argc+1;
|
||||||
|
+ arguments.inputs = xmalloc ((arguments.input_max + 1)
|
||||||
|
+ * sizeof (arguments.inputs[0]));
|
||||||
|
+ memset (arguments.inputs, 0, (arguments.input_max + 1)
|
||||||
|
+ * sizeof (arguments.inputs[0]));
|
||||||
|
+
|
||||||
|
+ /* Parse our arguments */
|
||||||
|
+ if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
|
||||||
|
+ grub_util_error ("%s", _("Error in parsing command line arguments\n"));
|
||||||
|
+
|
||||||
|
+ /* If there's no inputs in argv, add one for stdin */
|
||||||
|
+ if (!arguments.ninputs)
|
||||||
|
+ {
|
||||||
|
+ arguments.ninputs = 1;
|
||||||
|
+ arguments.inputs[0] = xmalloc (2);
|
||||||
|
+ strcpy(arguments.inputs[0], "-");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < arguments.ninputs; i++)
|
||||||
|
+ add_input(arguments.inputs[i], &package_names, &n_package_names);
|
||||||
|
+
|
||||||
|
+ if (package_names == NULL || n_package_names < 1)
|
||||||
|
+ grub_util_error ("%s", _("Invalid input\n"));
|
||||||
|
+
|
||||||
|
+ qsort (package_names, n_package_names, sizeof (char *),
|
||||||
|
+ package_version_compare);
|
||||||
|
+
|
||||||
|
+ /* send sorted list to stdout */
|
||||||
|
+ for (i = 0; i < n_package_names; i++)
|
||||||
|
+ {
|
||||||
|
+ fprintf (stdout, "%s\n", package_names[i]);
|
||||||
|
+ free (package_names[i]);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free (package_names);
|
||||||
|
+ for (i = 0; i < arguments.ninputs; i++)
|
||||||
|
+ free (arguments.inputs[i]);
|
||||||
|
+
|
||||||
|
+ free (arguments.inputs);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
||||||
|
index 0f6505bf3b6..42c2ea9ba50 100644
|
||||||
|
--- a/util/grub-mkconfig_lib.in
|
||||||
|
+++ b/util/grub-mkconfig_lib.in
|
||||||
|
@@ -33,6 +33,9 @@ fi
|
||||||
|
if test "x$grub_mkrelpath" = x; then
|
||||||
|
grub_mkrelpath="${bindir}/@grub_mkrelpath@"
|
||||||
|
fi
|
||||||
|
+if test "x$grub_rpm_sort" = x; then
|
||||||
|
+ grub_rpm_sort="${sbindir}/@grub_rpm_sort@"
|
||||||
|
+fi
|
||||||
|
|
||||||
|
if command -v gettext >/dev/null; then
|
||||||
|
:
|
||||||
|
@@ -218,6 +221,12 @@ version_sort ()
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
+if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
|
||||||
|
+ kernel_sort="$grub_rpm_sort"
|
||||||
|
+else
|
||||||
|
+ kernel_sort=version_sort
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
version_test_numeric ()
|
||||||
|
{
|
||||||
|
version_test_numeric_a="$1"
|
||||||
|
@@ -234,7 +243,7 @@ version_test_numeric ()
|
||||||
|
version_test_numeric_a="$version_test_numeric_b"
|
||||||
|
version_test_numeric_b="$version_test_numeric_c"
|
||||||
|
fi
|
||||||
|
- if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
|
||||||
|
+ if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | "$kernel_sort" | head -n 1 | grep -qx "$version_test_numeric_b" ; then
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..8ce21488448
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-rpm-sort.8
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+.TH GRUB-RPM-SORT 8 "Wed Feb 26 2014"
|
||||||
|
+.SH NAME
|
||||||
|
+\fBgrub-rpm-sort\fR \(em Sort input according to RPM version compare.
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+\fBgrub-rpm-sort\fR [OPTIONS].
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+You should not normally run this program directly. Use grub-mkconfig instead.
|
||||||
|
+
|
||||||
|
+.SH SEE ALSO
|
||||||
|
+.BR "info grub"
|
||||||
@ -0,0 +1,69 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 28 Apr 2015 11:15:03 -0400
|
||||||
|
Subject: [PATCH] Make grub2-mkconfig construct titles that look like the ones
|
||||||
|
we want elsewhere.
|
||||||
|
|
||||||
|
Resolves: rhbz#1215839
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub.d/10_linux.in | 34 +++++++++++++++++++++++++++-------
|
||||||
|
1 file changed, 27 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index fed73271478..2e59f3b4197 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -78,6 +78,32 @@ case x"$GRUB_FS" in
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
+mktitle ()
|
||||||
|
+{
|
||||||
|
+ local title_type
|
||||||
|
+ local version
|
||||||
|
+ local OS_NAME
|
||||||
|
+ local OS_VERS
|
||||||
|
+
|
||||||
|
+ title_type=$1 && shift
|
||||||
|
+ version=$1 && shift
|
||||||
|
+
|
||||||
|
+ OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})"
|
||||||
|
+ OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})"
|
||||||
|
+
|
||||||
|
+ case $title_type in
|
||||||
|
+ recovery)
|
||||||
|
+ title=$(printf '%s (%s) %s (recovery mode)' \
|
||||||
|
+ "${OS_NAME}" "${version}" "${OS_VERS}")
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ title=$(printf '%s (%s) %s' \
|
||||||
|
+ "${OS_NAME}" "${version}" "${OS_VERS}")
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ echo -n ${title}
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
title_correction_code=
|
||||||
|
|
||||||
|
linux_entry ()
|
||||||
|
@@ -91,17 +117,11 @@ linux_entry ()
|
||||||
|
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||||
|
fi
|
||||||
|
if [ x$type != xsimple ] ; then
|
||||||
|
- case $type in
|
||||||
|
- recovery)
|
||||||
|
- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
|
||||||
|
- *)
|
||||||
|
- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
|
||||||
|
- esac
|
||||||
|
+ title=$(mktitle "$type" "$version")
|
||||||
|
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
||||||
|
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
||||||
|
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
||||||
|
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
||||||
|
- grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
||||||
|
fi
|
||||||
|
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||||
|
else
|
||||||
@ -0,0 +1,269 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Robert Marshall <rmarshall@redhat.com>
|
||||||
|
Date: Thu, 25 Jun 2015 11:13:11 -0400
|
||||||
|
Subject: [PATCH] Add friendly grub2 password config tool (#985962)
|
||||||
|
|
||||||
|
Provided a tool for users to reset the grub2 root user password
|
||||||
|
without having to alter the grub.cfg. The hashed password now
|
||||||
|
lives in a root-only-readable configuration file.
|
||||||
|
|
||||||
|
Resolves: rhbz#985962
|
||||||
|
|
||||||
|
Signed-off-by: Robert Marshall <rmarshall@redhat.com>
|
||||||
|
[pjones: fix the efidir in grub-setpassword and rename tool]
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
[luto: fix grub-setpassword -o's output path]
|
||||||
|
Andy Lutomirski <luto@kernel.org>
|
||||||
|
---
|
||||||
|
configure.ac | 1 +
|
||||||
|
Makefile.util.def | 13 +++++
|
||||||
|
util/grub-mkconfig.in | 2 +
|
||||||
|
util/grub-set-password.8 | 28 ++++++++++
|
||||||
|
util/grub-set-password.in | 128 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
util/grub.d/01_users.in | 11 ++++
|
||||||
|
6 files changed, 183 insertions(+)
|
||||||
|
create mode 100644 util/grub-set-password.8
|
||||||
|
create mode 100644 util/grub-set-password.in
|
||||||
|
create mode 100644 util/grub.d/01_users.in
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index fdcb452581c..30fd84d8067 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
|
||||||
|
grub_TRANSFORM([grub-mkrescue])
|
||||||
|
grub_TRANSFORM([grub-probe])
|
||||||
|
grub_TRANSFORM([grub-reboot])
|
||||||
|
+grub_TRANSFORM([grub-set-password])
|
||||||
|
grub_TRANSFORM([grub-rpm-sort])
|
||||||
|
grub_TRANSFORM([grub-script-check])
|
||||||
|
grub_TRANSFORM([grub-set-default])
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index ba4cf4b29b0..1a7dd433e33 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -452,6 +452,12 @@ script = {
|
||||||
|
installdir = grubconf;
|
||||||
|
};
|
||||||
|
|
||||||
|
+script = {
|
||||||
|
+ name = '01_users';
|
||||||
|
+ common = util/grub.d/01_users.in;
|
||||||
|
+ installdir = grubconf;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
script = {
|
||||||
|
name = '10_windows';
|
||||||
|
common = util/grub.d/10_windows.in;
|
||||||
|
@@ -740,6 +746,13 @@ script = {
|
||||||
|
installdir = sbin;
|
||||||
|
};
|
||||||
|
|
||||||
|
+script = {
|
||||||
|
+ name = grub-set-password;
|
||||||
|
+ common = util/grub-set-password.in;
|
||||||
|
+ mansection = 8;
|
||||||
|
+ installdir = sbin;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
script = {
|
||||||
|
name = grub-mkconfig_lib;
|
||||||
|
common = util/grub-mkconfig_lib.in;
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index 8ea2315ebc2..ba14cf6261c 100644
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
|
||||||
|
*~) ;;
|
||||||
|
# emacsen autosave files. FIXME: support other editors
|
||||||
|
*/\#*\#) ;;
|
||||||
|
+ # rpm config files of yore.
|
||||||
|
+ *.rpmsave|*.rpmnew|*.rpmorig) ;;
|
||||||
|
*)
|
||||||
|
if grub_file_is_not_garbage "$i" && test -x "$i" ; then
|
||||||
|
echo
|
||||||
|
diff --git a/util/grub-set-password.8 b/util/grub-set-password.8
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..9646546e43d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-set-password.8
|
||||||
|
@@ -0,0 +1,28 @@
|
||||||
|
+.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015"
|
||||||
|
+.SH NAME
|
||||||
|
+\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+\fBgrub-set-password\fR [OPTION]
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBgrub-set-password\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
|
||||||
|
+
|
||||||
|
+The file has the format:
|
||||||
|
+GRUB2_PASSWORD=<\fIhashed password\fR>.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP
|
||||||
|
+-h, --help
|
||||||
|
+Display program usage and exit.
|
||||||
|
+.TP
|
||||||
|
+-v, --version
|
||||||
|
+Display the current version.
|
||||||
|
+.TP
|
||||||
|
+-o, --output=<\fIDIRECTORY\fR>
|
||||||
|
+Choose the file path to which user.cfg will be written.
|
||||||
|
+
|
||||||
|
+.SH SEE ALSO
|
||||||
|
+.BR "info grub"
|
||||||
|
+
|
||||||
|
+.BR "info grub2-mkpasswd-pbkdf2"
|
||||||
|
diff --git a/util/grub-set-password.in b/util/grub-set-password.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..5ebf50576d6
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-set-password.in
|
||||||
|
@@ -0,0 +1,128 @@
|
||||||
|
+#!/bin/sh -e
|
||||||
|
+
|
||||||
|
+EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
|
||||||
|
+if [ -d /sys/firmware/efi/efivars/ ]; then
|
||||||
|
+ grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
|
||||||
|
+else
|
||||||
|
+ grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+PACKAGE_VERSION="@PACKAGE_VERSION@"
|
||||||
|
+PACKAGE_NAME="@PACKAGE_NAME@"
|
||||||
|
+self=`basename $0`
|
||||||
|
+bindir="@bindir@"
|
||||||
|
+grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"
|
||||||
|
+
|
||||||
|
+# Usage: usage
|
||||||
|
+# Print the usage.
|
||||||
|
+usage () {
|
||||||
|
+ cat <<EOF
|
||||||
|
+Usage: $0 [OPTION]
|
||||||
|
+$0 prompts the user to set a password on the grub bootloader. The password
|
||||||
|
+is written to a file named user.cfg which lives in the GRUB directory
|
||||||
|
+located by default at ${grubdir}.
|
||||||
|
+
|
||||||
|
+ -h, --help print this message and exit
|
||||||
|
+ -v, --version print the version information and exit
|
||||||
|
+ -o, --output_path <DIRECTORY> put user.cfg in a user-selected directory
|
||||||
|
+
|
||||||
|
+Report bugs at https://bugzilla.redhat.com.
|
||||||
|
+EOF
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+argument () {
|
||||||
|
+ opt=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ if test $# -eq 0; then
|
||||||
|
+ gettext_printf "%s: option requires an argument -- \`%s'\n" "$self" "$opt" 1>&2
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+ echo $1
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# Ensure that it's the root user running this script
|
||||||
|
+if [ "${EUID}" -ne 0 ]; then
|
||||||
|
+ echo "The grub bootloader password may only be set by root."
|
||||||
|
+ usage
|
||||||
|
+ exit 2
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+# Check the arguments.
|
||||||
|
+while test $# -gt 0
|
||||||
|
+do
|
||||||
|
+ option=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ case "$option" in
|
||||||
|
+ -h | --help)
|
||||||
|
+ usage
|
||||||
|
+ exit 0 ;;
|
||||||
|
+ -v | --version)
|
||||||
|
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
|
||||||
|
+ exit 0 ;;
|
||||||
|
+ -o | --output)
|
||||||
|
+ OUTPUT_PATH=`argument $option "$@"`; shift ;;
|
||||||
|
+ --output=*)
|
||||||
|
+ OUTPUT_PATH=`echo "$option" | sed 's/--output=//'` ;;
|
||||||
|
+ -o=*)
|
||||||
|
+ OUTPUT_PATH=`echo "$option" | sed 's/-o=//'` ;;
|
||||||
|
+ esac
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
+# set user input or default path for user.cfg file
|
||||||
|
+if [ -z "${OUTPUT_PATH}" ]; then
|
||||||
|
+ OUTPUT_PATH="${grubdir}"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ ! -d "${OUTPUT_PATH}" ]; then
|
||||||
|
+ echo "${OUTPUT_PATH} does not exist."
|
||||||
|
+ usage
|
||||||
|
+ exit 2;
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+ttyopt=$(stty -g)
|
||||||
|
+fixtty() {
|
||||||
|
+ stty ${ttyopt}
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+trap fixtty EXIT
|
||||||
|
+stty -echo
|
||||||
|
+
|
||||||
|
+# prompt & confirm new grub2 root user password
|
||||||
|
+echo -n "Enter password: "
|
||||||
|
+read PASSWORD
|
||||||
|
+echo
|
||||||
|
+echo -n "Confirm password: "
|
||||||
|
+read PASSWORD_CONFIRM
|
||||||
|
+echo
|
||||||
|
+stty ${ttyopt}
|
||||||
|
+
|
||||||
|
+getpass() {
|
||||||
|
+ local P0
|
||||||
|
+ local P1
|
||||||
|
+ P0="$1" && shift
|
||||||
|
+ P1="$1" && shift
|
||||||
|
+
|
||||||
|
+ ( echo ${P0} ; echo ${P1} ) | \
|
||||||
|
+ LC_ALL=C ${grub_mkpasswd} | \
|
||||||
|
+ grep -v '[eE]nter password:' | \
|
||||||
|
+ sed -e "s/PBKDF2 hash of your password is //"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+MYPASS="$(getpass "${PASSWORD}" "${PASSWORD_CONFIRM}")"
|
||||||
|
+if [ -z "${MYPASS}" ]; then
|
||||||
|
+ echo "${self}: error: empty password" 1>&2
|
||||||
|
+ exit 1
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+# on the ESP, these will fail to set the permissions, but it's okay because
|
||||||
|
+# the directory is protected.
|
||||||
|
+install -m 0600 /dev/null "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
|
||||||
|
+chmod 0600 "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
|
||||||
|
+echo "GRUB2_PASSWORD=${MYPASS}" > "${OUTPUT_PATH}/user.cfg"
|
||||||
|
+
|
||||||
|
+if ! grep -q "^### BEGIN /etc/grub.d/01_users ###$" "${OUTPUT_PATH}/grub.cfg"; then
|
||||||
|
+ echo "WARNING: The current configuration lacks password support!"
|
||||||
|
+ echo "Update your configuration with @grub_mkconfig@ to support this feature."
|
||||||
|
+fi
|
||||||
|
diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..db2f44bfb78
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub.d/01_users.in
|
||||||
|
@@ -0,0 +1,11 @@
|
||||||
|
+#!/bin/sh -e
|
||||||
|
+cat << EOF
|
||||||
|
+if [ -f \${prefix}/user.cfg ]; then
|
||||||
|
+ source \${prefix}/user.cfg
|
||||||
|
+ if [ -n "\${GRUB2_PASSWORD}" ]; then
|
||||||
|
+ set superusers="root"
|
||||||
|
+ export superusers
|
||||||
|
+ password_pbkdf2 root \${GRUB2_PASSWORD}
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+EOF
|
||||||
@ -0,0 +1,87 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josef Bacik <jbacik@fb.com>
|
||||||
|
Date: Wed, 12 Aug 2015 08:57:55 -0700
|
||||||
|
Subject: [PATCH] tcp: add window scaling support
|
||||||
|
|
||||||
|
Sometimes we have to provision boxes across regions, such as California to
|
||||||
|
Sweden. The http server has a 10 minute timeout, so if we can't get our 250mb
|
||||||
|
image transferred fast enough our provisioning fails, which is not ideal. So
|
||||||
|
add tcp window scaling on open connections and set the window size to 1mb. With
|
||||||
|
this change we're able to get higher sustained transfers between regions and can
|
||||||
|
transfer our image in well below 10 minutes. Without this patch we'd time out
|
||||||
|
every time halfway through the transfer. Thanks,
|
||||||
|
|
||||||
|
Signed-off-by: Josef Bacik <jbacik@fb.com>
|
||||||
|
---
|
||||||
|
grub-core/net/tcp.c | 42 +++++++++++++++++++++++++++++-------------
|
||||||
|
1 file changed, 29 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
|
||||||
|
index e8ad34b84d4..7d4b822626d 100644
|
||||||
|
--- a/grub-core/net/tcp.c
|
||||||
|
+++ b/grub-core/net/tcp.c
|
||||||
|
@@ -106,6 +106,18 @@ struct tcphdr
|
||||||
|
grub_uint16_t urgent;
|
||||||
|
} GRUB_PACKED;
|
||||||
|
|
||||||
|
+struct tcp_scale_opt {
|
||||||
|
+ grub_uint8_t kind;
|
||||||
|
+ grub_uint8_t length;
|
||||||
|
+ grub_uint8_t scale;
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+
|
||||||
|
+struct tcp_synhdr {
|
||||||
|
+ struct tcphdr tcphdr;
|
||||||
|
+ struct tcp_scale_opt scale_opt;
|
||||||
|
+ grub_uint8_t padding;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
struct tcp_pseudohdr
|
||||||
|
{
|
||||||
|
grub_uint32_t src;
|
||||||
|
@@ -566,7 +578,7 @@ grub_net_tcp_open (char *server,
|
||||||
|
grub_net_tcp_socket_t socket;
|
||||||
|
static grub_uint16_t in_port = 21550;
|
||||||
|
struct grub_net_buff *nb;
|
||||||
|
- struct tcphdr *tcph;
|
||||||
|
+ struct tcp_synhdr *tcph;
|
||||||
|
int i;
|
||||||
|
grub_uint8_t *nbd;
|
||||||
|
grub_net_link_level_address_t ll_target_addr;
|
||||||
|
@@ -635,20 +647,24 @@ grub_net_tcp_open (char *server,
|
||||||
|
}
|
||||||
|
|
||||||
|
tcph = (void *) nb->data;
|
||||||
|
+ grub_memset(tcph, 0, sizeof (*tcph));
|
||||||
|
socket->my_start_seq = grub_get_time_ms ();
|
||||||
|
socket->my_cur_seq = socket->my_start_seq + 1;
|
||||||
|
- socket->my_window = 8192;
|
||||||
|
- tcph->seqnr = grub_cpu_to_be32 (socket->my_start_seq);
|
||||||
|
- tcph->ack = grub_cpu_to_be32_compile_time (0);
|
||||||
|
- tcph->flags = grub_cpu_to_be16_compile_time ((5 << 12) | TCP_SYN);
|
||||||
|
- tcph->window = grub_cpu_to_be16 (socket->my_window);
|
||||||
|
- tcph->urgent = 0;
|
||||||
|
- tcph->src = grub_cpu_to_be16 (socket->in_port);
|
||||||
|
- tcph->dst = grub_cpu_to_be16 (socket->out_port);
|
||||||
|
- tcph->checksum = 0;
|
||||||
|
- tcph->checksum = grub_net_ip_transport_checksum (nb, GRUB_NET_IP_TCP,
|
||||||
|
- &socket->inf->address,
|
||||||
|
- &socket->out_nla);
|
||||||
|
+ socket->my_window = 32768;
|
||||||
|
+ tcph->tcphdr.seqnr = grub_cpu_to_be32 (socket->my_start_seq);
|
||||||
|
+ tcph->tcphdr.ack = grub_cpu_to_be32_compile_time (0);
|
||||||
|
+ tcph->tcphdr.flags = grub_cpu_to_be16_compile_time ((6 << 12) | TCP_SYN);
|
||||||
|
+ tcph->tcphdr.window = grub_cpu_to_be16 (socket->my_window);
|
||||||
|
+ tcph->tcphdr.urgent = 0;
|
||||||
|
+ tcph->tcphdr.src = grub_cpu_to_be16 (socket->in_port);
|
||||||
|
+ tcph->tcphdr.dst = grub_cpu_to_be16 (socket->out_port);
|
||||||
|
+ tcph->tcphdr.checksum = 0;
|
||||||
|
+ tcph->scale_opt.kind = 3;
|
||||||
|
+ tcph->scale_opt.length = 3;
|
||||||
|
+ tcph->scale_opt.scale = 5;
|
||||||
|
+ tcph->tcphdr.checksum = grub_net_ip_transport_checksum (nb, GRUB_NET_IP_TCP,
|
||||||
|
+ &socket->inf->address,
|
||||||
|
+ &socket->out_nla);
|
||||||
|
|
||||||
|
tcp_socket_register (socket);
|
||||||
|
|
||||||
@ -0,0 +1,651 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 9 Jul 2019 11:47:37 +0200
|
||||||
|
Subject: [PATCH] efinet and bootp: add support for dhcpv6
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/net/bootp.c | 173 +++++++++++++++++++++++++++++++++++++
|
||||||
|
grub-core/net/drivers/efi/efinet.c | 53 ++++++++++--
|
||||||
|
grub-core/net/net.c | 72 +++++++++++++++
|
||||||
|
grub-core/net/tftp.c | 4 +
|
||||||
|
include/grub/efi/api.h | 129 +++++++++++++++++++++++++--
|
||||||
|
include/grub/net.h | 60 +++++++++++++
|
||||||
|
6 files changed, 477 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
||||||
|
index 6fb5627025d..e28fb6a09f9 100644
|
||||||
|
--- a/grub-core/net/bootp.c
|
||||||
|
+++ b/grub-core/net/bootp.c
|
||||||
|
@@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
|
||||||
|
|
||||||
|
static grub_command_t cmd_getdhcp, cmd_bootp, cmd_dhcp;
|
||||||
|
|
||||||
|
+struct grub_net_network_level_interface *
|
||||||
|
+grub_net_configure_by_dhcpv6_ack (const char *name,
|
||||||
|
+ struct grub_net_card *card,
|
||||||
|
+ grub_net_interface_flags_t flags
|
||||||
|
+ __attribute__((__unused__)),
|
||||||
|
+ const grub_net_link_level_address_t *hwaddr,
|
||||||
|
+ const struct grub_net_dhcpv6_packet *packet,
|
||||||
|
+ int is_def, char **device, char **path)
|
||||||
|
+{
|
||||||
|
+ struct grub_net_network_level_interface *inter = NULL;
|
||||||
|
+ struct grub_net_network_level_address addr;
|
||||||
|
+ int mask = -1;
|
||||||
|
+
|
||||||
|
+ if (!device || !path)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
+ *device = 0;
|
||||||
|
+ *path = 0;
|
||||||
|
+
|
||||||
|
+ grub_dprintf ("net", "mac address is %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||||
|
+ hwaddr->mac[0], hwaddr->mac[1], hwaddr->mac[2],
|
||||||
|
+ hwaddr->mac[3], hwaddr->mac[4], hwaddr->mac[5]);
|
||||||
|
+
|
||||||
|
+ if (is_def)
|
||||||
|
+ grub_net_default_server = 0;
|
||||||
|
+
|
||||||
|
+ if (is_def && !grub_net_default_server && packet)
|
||||||
|
+ {
|
||||||
|
+ const grub_uint8_t *options = packet->dhcp_options;
|
||||||
|
+ unsigned int option_max = 1024 - OFFSET_OF (dhcp_options, packet);
|
||||||
|
+ unsigned int i;
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < option_max - sizeof (grub_net_dhcpv6_option_t); )
|
||||||
|
+ {
|
||||||
|
+ grub_uint16_t num, len;
|
||||||
|
+ grub_net_dhcpv6_option_t *opt =
|
||||||
|
+ (grub_net_dhcpv6_option_t *)(options + i);
|
||||||
|
+
|
||||||
|
+ num = grub_be_to_cpu16(opt->option_num);
|
||||||
|
+ len = grub_be_to_cpu16(opt->option_len);
|
||||||
|
+
|
||||||
|
+ grub_dprintf ("net", "got dhcpv6 option %d len %d\n", num, len);
|
||||||
|
+
|
||||||
|
+ if (len == 0)
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ if (len + i > 1024)
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ if (num == GRUB_NET_DHCP6_BOOTFILE_URL)
|
||||||
|
+ {
|
||||||
|
+ char *scheme, *userinfo, *host, *file;
|
||||||
|
+ char *tmp;
|
||||||
|
+ int hostlen;
|
||||||
|
+ int port;
|
||||||
|
+ int rc = extract_url_info ((const char *)opt->option_data,
|
||||||
|
+ (grub_size_t)len,
|
||||||
|
+ &scheme, &userinfo, &host, &port,
|
||||||
|
+ &file);
|
||||||
|
+ if (rc < 0)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ /* right now this only handles tftp. */
|
||||||
|
+ if (grub_strcmp("tftp", scheme))
|
||||||
|
+ {
|
||||||
|
+ grub_free (scheme);
|
||||||
|
+ grub_free (userinfo);
|
||||||
|
+ grub_free (host);
|
||||||
|
+ grub_free (file);
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ grub_free (userinfo);
|
||||||
|
+
|
||||||
|
+ hostlen = grub_strlen (host);
|
||||||
|
+ if (hostlen > 2 && host[0] == '[' && host[hostlen-1] == ']')
|
||||||
|
+ {
|
||||||
|
+ tmp = host+1;
|
||||||
|
+ host[hostlen-1] = '\0';
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ tmp = host;
|
||||||
|
+
|
||||||
|
+ *device = grub_xasprintf ("%s,%s", scheme, tmp);
|
||||||
|
+ grub_free (scheme);
|
||||||
|
+ grub_free (host);
|
||||||
|
+
|
||||||
|
+ if (file && *file)
|
||||||
|
+ {
|
||||||
|
+ tmp = grub_strrchr (file, '/');
|
||||||
|
+ if (tmp)
|
||||||
|
+ *(tmp+1) = '\0';
|
||||||
|
+ else
|
||||||
|
+ file[0] = '\0';
|
||||||
|
+ }
|
||||||
|
+ else if (!file)
|
||||||
|
+ file = grub_strdup ("");
|
||||||
|
+
|
||||||
|
+ if (file[0] == '/')
|
||||||
|
+ {
|
||||||
|
+ *path = grub_strdup (file+1);
|
||||||
|
+ grub_free (file);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ *path = file;
|
||||||
|
+ }
|
||||||
|
+ else if (num == GRUB_NET_DHCP6_IA_NA)
|
||||||
|
+ {
|
||||||
|
+ const grub_net_dhcpv6_option_t *ia_na_opt;
|
||||||
|
+ const grub_net_dhcpv6_opt_ia_na_t *ia_na =
|
||||||
|
+ (const grub_net_dhcpv6_opt_ia_na_t *)opt;
|
||||||
|
+ unsigned int left = len - OFFSET_OF (options, ia_na);
|
||||||
|
+ unsigned int j;
|
||||||
|
+
|
||||||
|
+ if ((grub_uint8_t *)ia_na + left >
|
||||||
|
+ (grub_uint8_t *)options + option_max)
|
||||||
|
+ left -= ((grub_uint8_t *)ia_na + left)
|
||||||
|
+ - ((grub_uint8_t *)options + option_max);
|
||||||
|
+
|
||||||
|
+ if (len < OFFSET_OF (option_data, opt)
|
||||||
|
+ + sizeof (grub_net_dhcpv6_option_t))
|
||||||
|
+ {
|
||||||
|
+ grub_dprintf ("net",
|
||||||
|
+ "found dhcpv6 ia_na option with no address\n");
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (j = 0; left > sizeof (grub_net_dhcpv6_option_t); )
|
||||||
|
+ {
|
||||||
|
+ ia_na_opt = (const grub_net_dhcpv6_option_t *)
|
||||||
|
+ (ia_na->options + j);
|
||||||
|
+ grub_uint16_t ia_na_opt_num, ia_na_opt_len;
|
||||||
|
+
|
||||||
|
+ ia_na_opt_num = grub_be_to_cpu16 (ia_na_opt->option_num);
|
||||||
|
+ ia_na_opt_len = grub_be_to_cpu16 (ia_na_opt->option_len);
|
||||||
|
+ if (ia_na_opt_len == 0)
|
||||||
|
+ break;
|
||||||
|
+ if (j + ia_na_opt_len > left)
|
||||||
|
+ break;
|
||||||
|
+ if (ia_na_opt_num == GRUB_NET_DHCP6_IA_ADDRESS)
|
||||||
|
+ {
|
||||||
|
+ const grub_net_dhcpv6_opt_ia_address_t *ia_addr;
|
||||||
|
+
|
||||||
|
+ ia_addr = (const grub_net_dhcpv6_opt_ia_address_t *)
|
||||||
|
+ ia_na_opt;
|
||||||
|
+ addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
|
||||||
|
+ grub_memcpy(addr.ipv6, ia_addr->ipv6_address,
|
||||||
|
+ sizeof (ia_addr->ipv6_address));
|
||||||
|
+ inter = grub_net_add_addr (name, card, &addr, hwaddr, 0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ j += ia_na_opt_len;
|
||||||
|
+ left -= ia_na_opt_len;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ i += len + 4;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_print_error ();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (is_def)
|
||||||
|
+ {
|
||||||
|
+ grub_env_set ("net_default_interface", name);
|
||||||
|
+ grub_env_export ("net_default_interface");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (inter)
|
||||||
|
+ grub_net_add_ipv6_local (inter, mask);
|
||||||
|
+ return inter;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
void
|
||||||
|
grub_bootp_init (void)
|
||||||
|
{
|
||||||
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
index 5388f952ba9..173fb63153c 100644
|
||||||
|
--- a/grub-core/net/drivers/efi/efinet.c
|
||||||
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
@@ -18,11 +18,14 @@
|
||||||
|
|
||||||
|
#include <grub/net/netbuff.h>
|
||||||
|
#include <grub/dl.h>
|
||||||
|
+#include <grub/env.h>
|
||||||
|
#include <grub/net.h>
|
||||||
|
#include <grub/time.h>
|
||||||
|
#include <grub/efi/api.h>
|
||||||
|
#include <grub/efi/efi.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
+#include <grub/lib/hexdump.h>
|
||||||
|
+#include <grub/types.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -329,7 +332,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
char **path)
|
||||||
|
{
|
||||||
|
struct grub_net_card *card;
|
||||||
|
- grub_efi_device_path_t *dp;
|
||||||
|
+ grub_efi_device_path_t *dp, *ldp = NULL;
|
||||||
|
|
||||||
|
dp = grub_efi_get_device_path (hnd);
|
||||||
|
if (! dp)
|
||||||
|
@@ -340,14 +343,19 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
grub_efi_device_path_t *cdp;
|
||||||
|
struct grub_efi_pxe *pxe;
|
||||||
|
struct grub_efi_pxe_mode *pxe_mode;
|
||||||
|
+
|
||||||
|
if (card->driver != &efidriver)
|
||||||
|
continue;
|
||||||
|
+
|
||||||
|
cdp = grub_efi_get_device_path (card->efi_handle);
|
||||||
|
if (! cdp)
|
||||||
|
continue;
|
||||||
|
+
|
||||||
|
+ ldp = grub_efi_find_last_device_path (dp);
|
||||||
|
+
|
||||||
|
if (grub_efi_compare_device_paths (dp, cdp) != 0)
|
||||||
|
{
|
||||||
|
- grub_efi_device_path_t *ldp, *dup_dp, *dup_ldp;
|
||||||
|
+ grub_efi_device_path_t *dup_dp, *dup_ldp;
|
||||||
|
int match;
|
||||||
|
|
||||||
|
/* EDK2 UEFI PXE driver creates pseudo devices with type IPv4/IPv6
|
||||||
|
@@ -356,7 +364,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
devices. We skip them when enumerating cards, so here we need to
|
||||||
|
find matching MAC device.
|
||||||
|
*/
|
||||||
|
- ldp = grub_efi_find_last_device_path (dp);
|
||||||
|
if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
|
||||||
|
|| (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
|
||||||
|
&& GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
|
||||||
|
@@ -373,16 +380,46 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
if (!match)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
pxe = grub_efi_open_protocol (hnd, &pxe_io_guid,
|
||||||
|
GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||||
|
if (! pxe)
|
||||||
|
continue;
|
||||||
|
+
|
||||||
|
pxe_mode = pxe->mode;
|
||||||
|
- grub_net_configure_by_dhcp_ack (card->name, card, 0,
|
||||||
|
- (struct grub_net_bootp_packet *)
|
||||||
|
- &pxe_mode->dhcp_ack,
|
||||||
|
- sizeof (pxe_mode->dhcp_ack),
|
||||||
|
- 1, device, path);
|
||||||
|
+ if (pxe_mode->using_ipv6)
|
||||||
|
+ {
|
||||||
|
+ grub_net_link_level_address_t hwaddr;
|
||||||
|
+ struct grub_net_network_level_interface *intf;
|
||||||
|
+
|
||||||
|
+ grub_dprintf ("efinet", "using ipv6 and dhcpv6\n");
|
||||||
|
+ grub_dprintf ("efinet", "dhcp_ack_received: %s%s\n",
|
||||||
|
+ pxe_mode->dhcp_ack_received ? "yes" : "no",
|
||||||
|
+ pxe_mode->dhcp_ack_received ? "" : " cannot continue");
|
||||||
|
+ if (!pxe_mode->dhcp_ack_received)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
+ grub_memcpy (hwaddr.mac,
|
||||||
|
+ card->efi_net->mode->current_address,
|
||||||
|
+ sizeof (hwaddr.mac));
|
||||||
|
+
|
||||||
|
+ intf = grub_net_configure_by_dhcpv6_ack (card->name, card, 0, &hwaddr,
|
||||||
|
+ (const struct grub_net_dhcpv6_packet *)&pxe_mode->dhcp_ack.dhcpv6,
|
||||||
|
+ 1, device, path);
|
||||||
|
+ if (intf && device && path)
|
||||||
|
+ grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ grub_dprintf ("efinet", "using ipv4 and dhcp\n");
|
||||||
|
+ grub_net_configure_by_dhcp_ack (card->name, card, 0,
|
||||||
|
+ (struct grub_net_bootp_packet *)
|
||||||
|
+ &pxe_mode->dhcp_ack,
|
||||||
|
+ sizeof (pxe_mode->dhcp_ack),
|
||||||
|
+ 1, device, path);
|
||||||
|
+ grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
|
||||||
|
+ }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
||||||
|
index 0ef148f4adc..22f2689aaeb 100644
|
||||||
|
--- a/grub-core/net/net.c
|
||||||
|
+++ b/grub-core/net/net.c
|
||||||
|
@@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
|
||||||
|
grub_net_network_level_interfaces = inter;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int
|
||||||
|
+grub_ipv6_get_masksize (grub_uint16_t be_mask[8])
|
||||||
|
+{
|
||||||
|
+ grub_uint8_t *mask;
|
||||||
|
+ grub_uint16_t mask16[8];
|
||||||
|
+ int x, y;
|
||||||
|
+ int ret = 128;
|
||||||
|
+
|
||||||
|
+ grub_memcpy (mask16, be_mask, sizeof (mask16));
|
||||||
|
+ for (x = 0; x < 8; x++)
|
||||||
|
+ mask16[x] = grub_be_to_cpu16 (mask16[x]);
|
||||||
|
+
|
||||||
|
+ mask = (grub_uint8_t *)mask16;
|
||||||
|
+
|
||||||
|
+ for (x = 15; x >= 0; x--)
|
||||||
|
+ {
|
||||||
|
+ grub_uint8_t octet = mask[x];
|
||||||
|
+ if (!octet)
|
||||||
|
+ {
|
||||||
|
+ ret -= 8;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ for (y = 0; y < 8; y++)
|
||||||
|
+ {
|
||||||
|
+ if (octet & (1 << y))
|
||||||
|
+ break;
|
||||||
|
+ else
|
||||||
|
+ ret--;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+grub_err_t
|
||||||
|
+grub_net_add_ipv6_local (struct grub_net_network_level_interface *inter,
|
||||||
|
+ int mask)
|
||||||
|
+{
|
||||||
|
+ struct grub_net_route *route;
|
||||||
|
+
|
||||||
|
+ if (inter->address.type != GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ if (mask == -1)
|
||||||
|
+ mask = grub_ipv6_get_masksize ((grub_uint16_t *)inter->address.ipv6);
|
||||||
|
+
|
||||||
|
+ if (mask == -1)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ route = grub_zalloc (sizeof (*route));
|
||||||
|
+ if (!route)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ route->name = grub_xasprintf ("%s:local", inter->name);
|
||||||
|
+ if (!route->name)
|
||||||
|
+ {
|
||||||
|
+ grub_free (route);
|
||||||
|
+ return grub_errno;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ route->target.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
|
||||||
|
+ grub_memcpy (route->target.ipv6.base, inter->address.ipv6,
|
||||||
|
+ sizeof (inter->address.ipv6));
|
||||||
|
+ route->target.ipv6.masksize = mask;
|
||||||
|
+ route->is_gateway = 0;
|
||||||
|
+ route->interface = inter;
|
||||||
|
+
|
||||||
|
+ grub_net_route_register (route);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
|
||||||
|
grub_err_t
|
||||||
|
grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,
|
||||||
|
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
|
||||||
|
index 7f44b30f521..4ab2f5c7357 100644
|
||||||
|
--- a/grub-core/net/tftp.c
|
||||||
|
+++ b/grub-core/net/tftp.c
|
||||||
|
@@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename)
|
||||||
|
file->not_easily_seekable = 1;
|
||||||
|
file->data = data;
|
||||||
|
|
||||||
|
+ grub_dprintf("tftp", "resolving address for %s\n", file->device->net->server);
|
||||||
|
err = grub_net_resolve_address (file->device->net->server, &addr);
|
||||||
|
if (err)
|
||||||
|
{
|
||||||
|
+ grub_dprintf("tftp", "Address resolution failed: %d\n", err);
|
||||||
|
grub_free (data);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ grub_dprintf("tftp", "opening connection\n");
|
||||||
|
data->sock = grub_net_udp_open (addr,
|
||||||
|
TFTP_SERVER_PORT, tftp_receive,
|
||||||
|
file);
|
||||||
|
if (!data->sock)
|
||||||
|
{
|
||||||
|
+ grub_dprintf("tftp", "connection failed\n");
|
||||||
|
grub_free (data);
|
||||||
|
return grub_errno;
|
||||||
|
}
|
||||||
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
||||||
|
index f1a52210c0c..117469450d3 100644
|
||||||
|
--- a/include/grub/efi/api.h
|
||||||
|
+++ b/include/grub/efi/api.h
|
||||||
|
@@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t;
|
||||||
|
typedef void *grub_efi_event_t;
|
||||||
|
typedef grub_efi_uint64_t grub_efi_lba_t;
|
||||||
|
typedef grub_efi_uintn_t grub_efi_tpl_t;
|
||||||
|
-typedef grub_uint8_t grub_efi_mac_address_t[32];
|
||||||
|
-typedef grub_uint8_t grub_efi_ipv4_address_t[4];
|
||||||
|
-typedef grub_uint16_t grub_efi_ipv6_address_t[8];
|
||||||
|
-typedef grub_uint8_t grub_efi_ip_address_t[8] __attribute__ ((aligned(4)));
|
||||||
|
+typedef grub_efi_uint8_t grub_efi_mac_address_t[32];
|
||||||
|
+typedef grub_efi_uint8_t grub_efi_ipv4_address_t[4];
|
||||||
|
+typedef grub_efi_uint8_t grub_efi_ipv6_address_t[16];
|
||||||
|
+typedef union
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint32_t addr[4];
|
||||||
|
+ grub_efi_ipv4_address_t v4;
|
||||||
|
+ grub_efi_ipv6_address_t v6;
|
||||||
|
+} grub_efi_ip_address_t __attribute__ ((aligned(4)));
|
||||||
|
+
|
||||||
|
typedef grub_efi_uint64_t grub_efi_physical_address_t;
|
||||||
|
typedef grub_efi_uint64_t grub_efi_virtual_address_t;
|
||||||
|
|
||||||
|
@@ -1474,16 +1480,127 @@ struct grub_efi_simple_text_output_interface
|
||||||
|
};
|
||||||
|
typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output_interface_t;
|
||||||
|
|
||||||
|
-typedef grub_uint8_t grub_efi_pxe_packet_t[1472];
|
||||||
|
+typedef struct grub_efi_pxe_dhcpv4_packet
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint8_t bootp_opcode;
|
||||||
|
+ grub_efi_uint8_t bootp_hwtype;
|
||||||
|
+ grub_efi_uint8_t bootp_hwaddr_len;
|
||||||
|
+ grub_efi_uint8_t bootp_gate_hops;
|
||||||
|
+ grub_efi_uint32_t bootp_ident;
|
||||||
|
+ grub_efi_uint16_t bootp_seconds;
|
||||||
|
+ grub_efi_uint16_t bootp_flags;
|
||||||
|
+ grub_efi_uint8_t bootp_ci_addr[4];
|
||||||
|
+ grub_efi_uint8_t bootp_yi_addr[4];
|
||||||
|
+ grub_efi_uint8_t bootp_si_addr[4];
|
||||||
|
+ grub_efi_uint8_t bootp_gi_addr[4];
|
||||||
|
+ grub_efi_uint8_t bootp_hw_addr[16];
|
||||||
|
+ grub_efi_uint8_t bootp_srv_name[64];
|
||||||
|
+ grub_efi_uint8_t bootp_boot_file[128];
|
||||||
|
+ grub_efi_uint32_t dhcp_magik;
|
||||||
|
+ grub_efi_uint8_t dhcp_options[56];
|
||||||
|
+} grub_efi_pxe_dhcpv4_packet_t;
|
||||||
|
+
|
||||||
|
+struct grub_efi_pxe_dhcpv6_packet
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint32_t message_type:8;
|
||||||
|
+ grub_efi_uint32_t transaction_id:24;
|
||||||
|
+ grub_efi_uint8_t dhcp_options[1024];
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+typedef struct grub_efi_pxe_dhcpv6_packet grub_efi_pxe_dhcpv6_packet_t;
|
||||||
|
+
|
||||||
|
+typedef union
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint8_t raw[1472];
|
||||||
|
+ grub_efi_pxe_dhcpv4_packet_t dhcpv4;
|
||||||
|
+ grub_efi_pxe_dhcpv6_packet_t dhcpv6;
|
||||||
|
+} grub_efi_pxe_packet_t;
|
||||||
|
+
|
||||||
|
+#define GRUB_EFI_PXE_MAX_IPCNT 8
|
||||||
|
+#define GRUB_EFI_PXE_MAX_ARP_ENTRIES 8
|
||||||
|
+#define GRUB_EFI_PXE_MAX_ROUTE_ENTRIES 8
|
||||||
|
+
|
||||||
|
+typedef struct grub_efi_pxe_ip_filter
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint8_t filters;
|
||||||
|
+ grub_efi_uint8_t ip_count;
|
||||||
|
+ grub_efi_uint8_t reserved;
|
||||||
|
+ grub_efi_ip_address_t ip_list[GRUB_EFI_PXE_MAX_IPCNT];
|
||||||
|
+} grub_efi_pxe_ip_filter_t;
|
||||||
|
+
|
||||||
|
+typedef struct grub_efi_pxe_arp_entry
|
||||||
|
+{
|
||||||
|
+ grub_efi_ip_address_t ip_addr;
|
||||||
|
+ grub_efi_mac_address_t mac_addr;
|
||||||
|
+} grub_efi_pxe_arp_entry_t;
|
||||||
|
+
|
||||||
|
+typedef struct grub_efi_pxe_route_entry
|
||||||
|
+{
|
||||||
|
+ grub_efi_ip_address_t ip_addr;
|
||||||
|
+ grub_efi_ip_address_t subnet_mask;
|
||||||
|
+ grub_efi_ip_address_t gateway_addr;
|
||||||
|
+} grub_efi_pxe_route_entry_t;
|
||||||
|
+
|
||||||
|
+typedef struct grub_efi_pxe_icmp_error
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint8_t type;
|
||||||
|
+ grub_efi_uint8_t code;
|
||||||
|
+ grub_efi_uint16_t checksum;
|
||||||
|
+ union
|
||||||
|
+ {
|
||||||
|
+ grub_efi_uint32_t reserved;
|
||||||
|
+ grub_efi_uint32_t mtu;
|
||||||
|
+ grub_efi_uint32_t pointer;
|
||||||
|
+ struct
|
||||||
|
+ {
|
||||||
|
+ grub_efi_uint16_t identifier;
|
||||||
|
+ grub_efi_uint16_t sequence;
|
||||||
|
+ } echo;
|
||||||
|
+ } u;
|
||||||
|
+ grub_efi_uint8_t data[494];
|
||||||
|
+} grub_efi_pxe_icmp_error_t;
|
||||||
|
+
|
||||||
|
+typedef struct grub_efi_pxe_tftp_error
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint8_t error_code;
|
||||||
|
+ grub_efi_char8_t error_string[127];
|
||||||
|
+} grub_efi_pxe_tftp_error_t;
|
||||||
|
|
||||||
|
typedef struct grub_efi_pxe_mode
|
||||||
|
{
|
||||||
|
- grub_uint8_t unused[52];
|
||||||
|
+ grub_efi_boolean_t started;
|
||||||
|
+ grub_efi_boolean_t ipv6_available;
|
||||||
|
+ grub_efi_boolean_t ipv6_supported;
|
||||||
|
+ grub_efi_boolean_t using_ipv6;
|
||||||
|
+ grub_efi_boolean_t bis_supported;
|
||||||
|
+ grub_efi_boolean_t bis_detected;
|
||||||
|
+ grub_efi_boolean_t auto_arp;
|
||||||
|
+ grub_efi_boolean_t send_guid;
|
||||||
|
+ grub_efi_boolean_t dhcp_discover_valid;
|
||||||
|
+ grub_efi_boolean_t dhcp_ack_received;
|
||||||
|
+ grub_efi_boolean_t proxy_offer_received;
|
||||||
|
+ grub_efi_boolean_t pxe_discover_valid;
|
||||||
|
+ grub_efi_boolean_t pxe_reply_received;
|
||||||
|
+ grub_efi_boolean_t pxe_bis_reply_received;
|
||||||
|
+ grub_efi_boolean_t icmp_error_received;
|
||||||
|
+ grub_efi_boolean_t tftp_error_received;
|
||||||
|
+ grub_efi_boolean_t make_callbacks;
|
||||||
|
+ grub_efi_uint8_t ttl;
|
||||||
|
+ grub_efi_uint8_t tos;
|
||||||
|
+ grub_efi_ip_address_t station_ip;
|
||||||
|
+ grub_efi_ip_address_t subnet_mask;
|
||||||
|
grub_efi_pxe_packet_t dhcp_discover;
|
||||||
|
grub_efi_pxe_packet_t dhcp_ack;
|
||||||
|
grub_efi_pxe_packet_t proxy_offer;
|
||||||
|
grub_efi_pxe_packet_t pxe_discover;
|
||||||
|
grub_efi_pxe_packet_t pxe_reply;
|
||||||
|
+ grub_efi_pxe_packet_t pxe_bis_reply;
|
||||||
|
+ grub_efi_pxe_ip_filter_t ip_filter;
|
||||||
|
+ grub_efi_uint32_t arp_cache_entries;
|
||||||
|
+ grub_efi_pxe_arp_entry_t arp_cache[GRUB_EFI_PXE_MAX_ARP_ENTRIES];
|
||||||
|
+ grub_efi_uint32_t route_table_entries;
|
||||||
|
+ grub_efi_pxe_route_entry_t route_table[GRUB_EFI_PXE_MAX_ROUTE_ENTRIES];
|
||||||
|
+ grub_efi_pxe_icmp_error_t icmp_error;
|
||||||
|
+ grub_efi_pxe_tftp_error_t tftp_error;
|
||||||
|
} grub_efi_pxe_mode_t;
|
||||||
|
|
||||||
|
typedef struct grub_efi_pxe
|
||||||
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
||||||
|
index 7ae4b6bd805..8a05ec4fe7a 100644
|
||||||
|
--- a/include/grub/net.h
|
||||||
|
+++ b/include/grub/net.h
|
||||||
|
@@ -447,6 +447,51 @@ struct grub_net_bootp_packet
|
||||||
|
grub_uint8_t vendor[0];
|
||||||
|
} GRUB_PACKED;
|
||||||
|
|
||||||
|
+enum
|
||||||
|
+ {
|
||||||
|
+ GRUB_NET_DHCP6_IA_NA = 3,
|
||||||
|
+ GRUB_NET_DHCP6_IA_ADDRESS = 5,
|
||||||
|
+ GRUB_NET_DHCP6_BOOTFILE_URL = 59,
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+struct grub_net_dhcpv6_option
|
||||||
|
+{
|
||||||
|
+ grub_uint16_t option_num;
|
||||||
|
+ grub_uint16_t option_len;
|
||||||
|
+ grub_uint8_t option_data[];
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+typedef struct grub_net_dhcpv6_option grub_net_dhcpv6_option_t;
|
||||||
|
+
|
||||||
|
+struct grub_net_dhcpv6_opt_ia_na
|
||||||
|
+{
|
||||||
|
+ grub_uint16_t option_num;
|
||||||
|
+ grub_uint16_t option_len;
|
||||||
|
+ grub_uint32_t iaid;
|
||||||
|
+ grub_uint32_t t1;
|
||||||
|
+ grub_uint32_t t2;
|
||||||
|
+ grub_uint8_t options[];
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+typedef struct grub_net_dhcpv6_opt_ia_na grub_net_dhcpv6_opt_ia_na_t;
|
||||||
|
+
|
||||||
|
+struct grub_net_dhcpv6_opt_ia_address
|
||||||
|
+{
|
||||||
|
+ grub_uint16_t option_num;
|
||||||
|
+ grub_uint16_t option_len;
|
||||||
|
+ grub_uint64_t ipv6_address[2];
|
||||||
|
+ grub_uint32_t preferred_lifetime;
|
||||||
|
+ grub_uint32_t valid_lifetime;
|
||||||
|
+ grub_uint8_t options[];
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+typedef struct grub_net_dhcpv6_opt_ia_address grub_net_dhcpv6_opt_ia_address_t;
|
||||||
|
+
|
||||||
|
+struct grub_net_dhcpv6_packet
|
||||||
|
+{
|
||||||
|
+ grub_uint32_t message_type:8;
|
||||||
|
+ grub_uint32_t transaction_id:24;
|
||||||
|
+ grub_uint8_t dhcp_options[1024];
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+typedef struct grub_net_dhcpv6_packet grub_net_dhcpv6_packet_t;
|
||||||
|
+
|
||||||
|
#define GRUB_NET_BOOTP_RFC1048_MAGIC_0 0x63
|
||||||
|
#define GRUB_NET_BOOTP_RFC1048_MAGIC_1 0x82
|
||||||
|
#define GRUB_NET_BOOTP_RFC1048_MAGIC_2 0x53
|
||||||
|
@@ -482,6 +527,21 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
||||||
|
grub_size_t size,
|
||||||
|
int is_def, char **device, char **path);
|
||||||
|
|
||||||
|
+struct grub_net_network_level_interface *
|
||||||
|
+grub_net_configure_by_dhcpv6_ack (const char *name,
|
||||||
|
+ struct grub_net_card *card,
|
||||||
|
+ grub_net_interface_flags_t flags,
|
||||||
|
+ const grub_net_link_level_address_t *hwaddr,
|
||||||
|
+ const struct grub_net_dhcpv6_packet *packet,
|
||||||
|
+ int is_def, char **device, char **path);
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+grub_ipv6_get_masksize(grub_uint16_t *mask);
|
||||||
|
+
|
||||||
|
+grub_err_t
|
||||||
|
+grub_net_add_ipv6_local (struct grub_net_network_level_interface *inf,
|
||||||
|
+ int mask);
|
||||||
|
+
|
||||||
|
grub_err_t
|
||||||
|
grub_net_add_ipv4_local (struct grub_net_network_level_interface *inf,
|
||||||
|
int mask);
|
||||||
@ -0,0 +1,296 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 23 Jun 2016 11:01:39 -0400
|
||||||
|
Subject: [PATCH] Add grub-get-kernel-settings and use it in 10_linux
|
||||||
|
|
||||||
|
This patch adds grub-get-kernel-settings, which reads the system kernel
|
||||||
|
installation configuration from /etc/sysconfig/kernel, and outputs
|
||||||
|
${GRUB_...} variables suitable for evaluation by grub-mkconfig. Those
|
||||||
|
variables are then used by 10_linux to choose whether or not to create
|
||||||
|
debug stanzas.
|
||||||
|
|
||||||
|
Resolves: rhbz#1226325
|
||||||
|
---
|
||||||
|
configure.ac | 2 +
|
||||||
|
Makefile.util.def | 7 ++
|
||||||
|
util/bash-completion.d/grub-completion.bash.in | 22 +++++++
|
||||||
|
util/grub-get-kernel-settings.3 | 20 ++++++
|
||||||
|
util/grub-get-kernel-settings.in | 88 ++++++++++++++++++++++++++
|
||||||
|
util/grub-mkconfig.in | 3 +
|
||||||
|
util/grub.d/10_linux.in | 23 +++++--
|
||||||
|
7 files changed, 160 insertions(+), 5 deletions(-)
|
||||||
|
create mode 100644 util/grub-get-kernel-settings.3
|
||||||
|
create mode 100644 util/grub-get-kernel-settings.in
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 30fd84d8067..ed31ea457d2 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
|
||||||
|
grub_TRANSFORM([grub-mkconfig])
|
||||||
|
grub_TRANSFORM([grub-mkfont])
|
||||||
|
grub_TRANSFORM([grub-mkimage])
|
||||||
|
+grub_TRANSFORM([grub-get-kernel-settings])
|
||||||
|
grub_TRANSFORM([grub-glue-efi])
|
||||||
|
grub_TRANSFORM([grub-mklayout])
|
||||||
|
grub_TRANSFORM([grub-mkpasswd-pbkdf2])
|
||||||
|
@@ -82,6 +83,7 @@ grub_TRANSFORM([grub-file])
|
||||||
|
grub_TRANSFORM([grub-bios-setup.3])
|
||||||
|
grub_TRANSFORM([grub-editenv.1])
|
||||||
|
grub_TRANSFORM([grub-fstest.3])
|
||||||
|
+grub_TRANSFORM([grub-get-kernel-settings.3])
|
||||||
|
grub_TRANSFORM([grub-glue-efi.3])
|
||||||
|
grub_TRANSFORM([grub-install.1])
|
||||||
|
grub_TRANSFORM([grub-kbdcomp.3])
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index 1a7dd433e33..cdd2f51fe4b 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -732,6 +732,13 @@ script = {
|
||||||
|
installdir = sbin;
|
||||||
|
};
|
||||||
|
|
||||||
|
+script = {
|
||||||
|
+ name = grub-get-kernel-settings;
|
||||||
|
+ common = util/grub-get-kernel-settings.in;
|
||||||
|
+ mansection = 3;
|
||||||
|
+ installdir = sbin;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
script = {
|
||||||
|
name = grub-set-default;
|
||||||
|
common = util/grub-set-default.in;
|
||||||
|
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
|
||||||
|
index 44bf135b9f8..5c4acd496d4 100644
|
||||||
|
--- a/util/bash-completion.d/grub-completion.bash.in
|
||||||
|
+++ b/util/bash-completion.d/grub-completion.bash.in
|
||||||
|
@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
|
||||||
|
unset __grub_sparc64_setup_program
|
||||||
|
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# grub-get-kernel-settings
|
||||||
|
+#
|
||||||
|
+_grub_get_kernel_settings () {
|
||||||
|
+ local cur
|
||||||
|
+
|
||||||
|
+ COMPREPLY=()
|
||||||
|
+ cur=`_get_cword`
|
||||||
|
+
|
||||||
|
+ if [[ "$cur" == -* ]]; then
|
||||||
|
+ __grubcomp "$(__grub_get_options_from_help)"
|
||||||
|
+ else
|
||||||
|
+ # Default complete with a filename
|
||||||
|
+ _filedir
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+__grub_get_kernel_settings_program="@grub_get_kernel_settings@"
|
||||||
|
+have ${__grub_get_kernel_settings_program} && \
|
||||||
|
+ complete -F _grub_get_kernel_settings -o filenames ${__grub_get_kernel_settings_program}
|
||||||
|
+unset __grub_get_kernel_settings_program
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# grub-install
|
||||||
|
#
|
||||||
|
diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..ba33330e28d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-get-kernel-settings.3
|
||||||
|
@@ -0,0 +1,20 @@
|
||||||
|
+.TH GRUB-GET-KERNEL-SETTINGS 3 "Thu Jun 25 2015"
|
||||||
|
+.SH NAME
|
||||||
|
+\fBgrub-get-kernel-settings\fR \(em Evaluate the system's kernel installation settings for use while making a grub configuration file.
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+\fBgrub-get-kernel-settings\fR [OPTION]
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBgrub-get-kernel-settings\fR reads the kernel installation settings on the host system, and emits a set of grub settings suitable for use when creating a grub configuration file.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP
|
||||||
|
+-h, --help
|
||||||
|
+Display program usage and exit.
|
||||||
|
+.TP
|
||||||
|
+-v, --version
|
||||||
|
+Display the current version.
|
||||||
|
+
|
||||||
|
+.SH SEE ALSO
|
||||||
|
+.BR "info grub"
|
||||||
|
diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..7e87dfccc0e
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-get-kernel-settings.in
|
||||||
|
@@ -0,0 +1,88 @@
|
||||||
|
+#!/bin/sh
|
||||||
|
+set -e
|
||||||
|
+
|
||||||
|
+# Evaluate new-kernel-pkg's configuration file.
|
||||||
|
+# Copyright (C) 2016 Free Software Foundation, Inc.
|
||||||
|
+#
|
||||||
|
+# GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+# it under the terms of the GNU General Public License as published by
|
||||||
|
+# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+# (at your option) any later version.
|
||||||
|
+#
|
||||||
|
+# GRUB 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 General Public License for more details.
|
||||||
|
+#
|
||||||
|
+# You should have received a copy of the GNU General Public License
|
||||||
|
+# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+
|
||||||
|
+PACKAGE_NAME=@PACKAGE_NAME@
|
||||||
|
+PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||||
|
+datadir="@datadir@"
|
||||||
|
+if [ "x$pkgdatadir" = x ]; then
|
||||||
|
+ pkgdatadir="${datadir}/@PACKAGE@"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+self=`basename $0`
|
||||||
|
+
|
||||||
|
+export TEXTDOMAIN=@PACKAGE@
|
||||||
|
+export TEXTDOMAINDIR="@localedir@"
|
||||||
|
+
|
||||||
|
+. "${pkgdatadir}/grub-mkconfig_lib"
|
||||||
|
+
|
||||||
|
+# Usage: usage
|
||||||
|
+# Print the usage.
|
||||||
|
+usage () {
|
||||||
|
+ gettext_printf "Usage: %s [OPTION]\n" "$self"
|
||||||
|
+ gettext "Evaluate new-kernel-pkg configuration"; echo
|
||||||
|
+ echo
|
||||||
|
+ print_option_help "-h, --help" "$(gettext "print this message and exit")"
|
||||||
|
+ print_option_help "-v, --version" "$(gettext "print the version information and exit")"
|
||||||
|
+ echo
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# Check the arguments.
|
||||||
|
+while test $# -gt 0
|
||||||
|
+do
|
||||||
|
+ option=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ case "$option" in
|
||||||
|
+ -h | --help)
|
||||||
|
+ usage
|
||||||
|
+ exit 0 ;;
|
||||||
|
+ -v | --version)
|
||||||
|
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
|
||||||
|
+ exit 0 ;;
|
||||||
|
+ -*)
|
||||||
|
+ gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
|
||||||
|
+ usage
|
||||||
|
+ exit 1
|
||||||
|
+ ;;
|
||||||
|
+ # Explicitly ignore non-option arguments, for compatibility.
|
||||||
|
+ esac
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
+if test -f /etc/sysconfig/kernel ; then
|
||||||
|
+ . /etc/sysconfig/kernel
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ "$MAKEDEBUG" = "yes" ]; then
|
||||||
|
+ echo GRUB_LINUX_MAKE_DEBUG=true
|
||||||
|
+ echo export GRUB_LINUX_MAKE_DEBUG
|
||||||
|
+ echo GRUB_CMDLINE_LINUX_DEBUG=\"systemd.log_level=debug systemd.log_target=kmsg\"
|
||||||
|
+ echo export GRUB_CMDLINE_LINUX_DEBUG
|
||||||
|
+ echo GRUB_LINUX_DEBUG_TITLE_POSTFIX=\" with debugging\"
|
||||||
|
+ echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX
|
||||||
|
+fi
|
||||||
|
+if [ "$DEFAULTDEBUG" = "yes" ]; then
|
||||||
|
+ echo GRUB_DEFAULT_TO_DEBUG=true
|
||||||
|
+else
|
||||||
|
+ echo GRUB_DEFAULT_TO_DEBUG=false
|
||||||
|
+fi
|
||||||
|
+echo export GRUB_DEFAULT_TO_DEBUG
|
||||||
|
+if [ "$UPDATEDEFAULT" = "yes" ]; then
|
||||||
|
+ echo GRUB_UPDATE_DEFAULT_KERNEL=true
|
||||||
|
+ echo export GRUB_UPDATE_DEFAULT_KERNEL
|
||||||
|
+fi
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index ba14cf6261c..005f093809b 100644
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
|
||||||
|
grub_file="${bindir}/@grub_file@"
|
||||||
|
grub_editenv="${bindir}/@grub_editenv@"
|
||||||
|
grub_script_check="${bindir}/@grub_script_check@"
|
||||||
|
+grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
|
||||||
|
|
||||||
|
export TEXTDOMAIN=@PACKAGE@
|
||||||
|
export TEXTDOMAINDIR="@localedir@"
|
||||||
|
@@ -158,6 +159,8 @@ if test -f ${sysconfdir}/default/grub ; then
|
||||||
|
. ${sysconfdir}/default/grub
|
||||||
|
fi
|
||||||
|
|
||||||
|
+eval "$("${grub_get_kernel_settings}")" || true
|
||||||
|
+
|
||||||
|
if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
|
||||||
|
if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
|
||||||
|
GRUB_DISABLE_LINUX_UUID="true"
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index 2e59f3b4197..0f3c19e30cc 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -111,7 +111,8 @@ linux_entry ()
|
||||||
|
os="$1"
|
||||||
|
version="$2"
|
||||||
|
type="$3"
|
||||||
|
- args="$4"
|
||||||
|
+ isdebug="$4"
|
||||||
|
+ args="$5"
|
||||||
|
|
||||||
|
if [ -z "$boot_device_id" ]; then
|
||||||
|
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||||
|
@@ -123,6 +124,9 @@ linux_entry ()
|
||||||
|
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
||||||
|
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
||||||
|
fi
|
||||||
|
+ if [ x$isdebug = xdebug ]; then
|
||||||
|
+ title="$title${GRUB_LINUX_DEBUG_TITLE_POSTFIX}"
|
||||||
|
+ fi
|
||||||
|
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||||
|
else
|
||||||
|
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
||||||
|
@@ -299,11 +303,15 @@ while [ "x$list" != "x" ] ; do
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
|
||||||
|
- linux_entry "${OS}" "${version}" simple \
|
||||||
|
+ linux_entry "${OS}" "${version}" simple standard \
|
||||||
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||||
|
+ if [ "x$GRUB_LINUX_MAKE_DEBUG" = "xtrue" ]; then
|
||||||
|
+ linux_entry "${OS}" "${version}" simple debug \
|
||||||
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_LINUX_DEBUG}"
|
||||||
|
+ fi
|
||||||
|
|
||||||
|
submenu_indentation="$grub_tab"
|
||||||
|
-
|
||||||
|
+
|
||||||
|
if [ -z "$boot_device_id" ]; then
|
||||||
|
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||||
|
fi
|
||||||
|
@@ -312,10 +320,15 @@ while [ "x$list" != "x" ] ; do
|
||||||
|
is_top_level=false
|
||||||
|
fi
|
||||||
|
|
||||||
|
- linux_entry "${OS}" "${version}" advanced \
|
||||||
|
+ linux_entry "${OS}" "${version}" advanced standard \
|
||||||
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||||
|
+ if [ "x$GRUB_LINUX_MAKE_DEBUG" = "xtrue" ]; then
|
||||||
|
+ linux_entry "${OS}" "${version}" advanced debug \
|
||||||
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_LINUX_DEBUG}"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
||||||
|
- linux_entry "${OS}" "${version}" recovery \
|
||||||
|
+ linux_entry "${OS}" "${version}" recovery standard \
|
||||||
|
"single ${GRUB_CMDLINE_LINUX}"
|
||||||
|
fi
|
||||||
|
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Masahiro Matsuya <mmatsuya@redhat.com>
|
||||||
|
Date: Sat, 29 Oct 2016 08:35:26 +0900
|
||||||
|
Subject: [PATCH] bz1374141 fix incorrect mask for ppc64
|
||||||
|
|
||||||
|
The netmask configured in firmware is not respected on ppc64 (big endian).
|
||||||
|
When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath().
|
||||||
|
|
||||||
|
/vdevice/l-lan@30000002:speed=auto,duplex=auto,192.168.88.10,,192.168.89.113,192.168.88.1,5,5,255.255.252.0,512
|
||||||
|
|
||||||
|
The netmask in this bootpath is no problem, since it's a value specified in firmware. But,
|
||||||
|
The value of 'subnet_mask.ipv4' was set with 0xfffffc00, and __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)) returned 16 (not 22).
|
||||||
|
As a result, 16 was used for netmask wrongly.
|
||||||
|
|
||||||
|
1111 1111 1111 1111 1111 1100 0000 0000 # subnet_mask.ipv4 (=0xfffffc00)
|
||||||
|
0000 0000 1111 1100 1111 1111 1111 1111 # grub_le_to_cpu32 (subnet_mask.ipv4)
|
||||||
|
1111 1111 0000 0011 0000 0000 0000 0000 # ~grub_le_to_cpu32 (subnet_mask.ipv4)
|
||||||
|
|
||||||
|
And, the count of zero with __builtin_ctz can be 16.
|
||||||
|
This patch changes it as below.
|
||||||
|
|
||||||
|
1111 1111 1111 1111 1111 1100 0000 0000 # subnet_mask.ipv4 (=0xfffffc00)
|
||||||
|
0000 0000 1111 1100 1111 1111 1111 1111 # grub_le_to_cpu32 (subnet_mask.ipv4)
|
||||||
|
1111 1111 1111 1111 1111 1100 0000 0000 # grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
|
||||||
|
0000 0000 0000 0000 0000 0011 1111 1111 # ~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
|
||||||
|
|
||||||
|
The count of zero with __builtin_clz can be 22. (clz counts the number of one bits preceding the most significant zero bit)
|
||||||
|
---
|
||||||
|
grub-core/net/drivers/ieee1275/ofnet.c | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
|
||||||
|
index ac4e62a95c9..3860b6f78d8 100644
|
||||||
|
--- a/grub-core/net/drivers/ieee1275/ofnet.c
|
||||||
|
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
|
||||||
|
@@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
|
||||||
|
flags);
|
||||||
|
inter->vlantag = vlantag;
|
||||||
|
grub_net_add_ipv4_local (inter,
|
||||||
|
- __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)));
|
||||||
|
-
|
||||||
|
+ __builtin_clz (~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (gateway_addr.ipv4 != 0)
|
||||||
@ -0,0 +1,172 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Wed, 27 Jan 2016 09:22:42 -0500
|
||||||
|
Subject: [PATCH] Make grub_fatal() also backtrace.
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/Makefile.core.def | 3 ++
|
||||||
|
grub-core/kern/misc.c | 8 +++++-
|
||||||
|
grub-core/lib/arm64/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++
|
||||||
|
grub-core/lib/backtrace.c | 2 ++
|
||||||
|
grub-core/lib/i386/backtrace.c | 14 +++++++++-
|
||||||
|
5 files changed, 87 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 grub-core/lib/arm64/backtrace.c
|
||||||
|
|
||||||
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
||||||
|
index c15e91943b9..058c88ac3af 100644
|
||||||
|
--- a/grub-core/Makefile.core.def
|
||||||
|
+++ b/grub-core/Makefile.core.def
|
||||||
|
@@ -188,6 +188,9 @@ kernel = {
|
||||||
|
|
||||||
|
softdiv = lib/division.c;
|
||||||
|
|
||||||
|
+ x86 = lib/i386/backtrace.c;
|
||||||
|
+ x86 = lib/backtrace.c;
|
||||||
|
+
|
||||||
|
i386 = kern/i386/dl.c;
|
||||||
|
i386_xen = kern/i386/dl.c;
|
||||||
|
i386_xen_pvh = kern/i386/dl.c;
|
||||||
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
||||||
|
index 63b586d09cb..a3e215155bd 100644
|
||||||
|
--- a/grub-core/kern/misc.c
|
||||||
|
+++ b/grub-core/kern/misc.c
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
#include <grub/term.h>
|
||||||
|
#include <grub/env.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
+#include <grub/backtrace.h>
|
||||||
|
|
||||||
|
union printf_arg
|
||||||
|
{
|
||||||
|
@@ -1199,8 +1200,13 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
|
||||||
|
static void __attribute__ ((noreturn))
|
||||||
|
grub_abort (void)
|
||||||
|
{
|
||||||
|
+#ifndef GRUB_UTIL
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__)
|
||||||
|
+ grub_backtrace();
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
grub_printf ("\nAborted.");
|
||||||
|
-
|
||||||
|
+
|
||||||
|
#ifndef GRUB_UTIL
|
||||||
|
if (grub_term_inputs)
|
||||||
|
#endif
|
||||||
|
diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..1079b5380e1
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/lib/arm64/backtrace.c
|
||||||
|
@@ -0,0 +1,62 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <grub/misc.h>
|
||||||
|
+#include <grub/command.h>
|
||||||
|
+#include <grub/err.h>
|
||||||
|
+#include <grub/dl.h>
|
||||||
|
+#include <grub/mm.h>
|
||||||
|
+#include <grub/term.h>
|
||||||
|
+#include <grub/backtrace.h>
|
||||||
|
+
|
||||||
|
+#define MAX_STACK_FRAME 102400
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_pointer (int frame)
|
||||||
|
+{
|
||||||
|
+ while (1)
|
||||||
|
+ {
|
||||||
|
+ void *lp = __builtin_return_address (frame);
|
||||||
|
+ if (!lp)
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ lp = __builtin_extract_return_addr (lp);
|
||||||
|
+
|
||||||
|
+ grub_printf ("%p: ", lp);
|
||||||
|
+ grub_backtrace_print_address (lp);
|
||||||
|
+ grub_printf (" (");
|
||||||
|
+ for (i = 0; i < 2; i++)
|
||||||
|
+ grub_printf ("%p,", ((void **)ptr) [i + 2]);
|
||||||
|
+ grub_printf ("%p)\n", ((void **)ptr) [i + 2]);
|
||||||
|
+ nptr = *(void **)ptr;
|
||||||
|
+ if (nptr < ptr || (void **) nptr - (void **) ptr > MAX_STACK_FRAME
|
||||||
|
+ || nptr == ptr)
|
||||||
|
+ {
|
||||||
|
+ grub_printf ("Invalid stack frame at %p (%p)\n", ptr, nptr);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ ptr = nptr;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace (void)
|
||||||
|
+{
|
||||||
|
+ grub_backtrace_pointer (1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
|
||||||
|
index 825a8800e25..c0ad6ab8be1 100644
|
||||||
|
--- a/grub-core/lib/backtrace.c
|
||||||
|
+++ b/grub-core/lib/backtrace.c
|
||||||
|
@@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
void
|
||||||
|
grub_backtrace_print_address (void *addr)
|
||||||
|
{
|
||||||
|
+#ifndef GRUB_UTIL
|
||||||
|
grub_dl_t mod;
|
||||||
|
|
||||||
|
FOR_DL_MODULES (mod)
|
||||||
|
@@ -44,6 +45,7 @@ grub_backtrace_print_address (void *addr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+#endif
|
||||||
|
grub_printf ("%p", addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
|
||||||
|
index c3e03c7275c..c67273db3ae 100644
|
||||||
|
--- a/grub-core/lib/i386/backtrace.c
|
||||||
|
+++ b/grub-core/lib/i386/backtrace.c
|
||||||
|
@@ -15,11 +15,23 @@
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
+#include <config.h>
|
||||||
|
+#ifdef GRUB_UTIL
|
||||||
|
+#define REALLY_GRUB_UTIL GRUB_UTIL
|
||||||
|
+#undef GRUB_UTIL
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#include <grub/symbol.h>
|
||||||
|
+#include <grub/dl.h>
|
||||||
|
+
|
||||||
|
+#ifdef REALLY_GRUB_UTIL
|
||||||
|
+#define GRUB_UTIL REALLY_GRUB_UTIL
|
||||||
|
+#undef REALLY_GRUB_UTIL
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include <grub/misc.h>
|
||||||
|
#include <grub/command.h>
|
||||||
|
#include <grub/err.h>
|
||||||
|
-#include <grub/dl.h>
|
||||||
|
#include <grub/mm.h>
|
||||||
|
#include <grub/term.h>
|
||||||
|
#include <grub/backtrace.h>
|
||||||
@ -0,0 +1,150 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 23 Sep 2014 09:58:49 -0400
|
||||||
|
Subject: [PATCH] Fix up some man pages rpmdiff noticed.
|
||||||
|
|
||||||
|
---
|
||||||
|
configure.ac | 2 ++
|
||||||
|
util/grub-macbless.8 | 26 +++++++++++++++++++
|
||||||
|
util/grub-mkimage.1 | 2 +-
|
||||||
|
util/grub-syslinux2cfg.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
4 files changed, 94 insertions(+), 1 deletion(-)
|
||||||
|
create mode 100644 util/grub-macbless.8
|
||||||
|
create mode 100644 util/grub-syslinux2cfg.1
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index ed31ea457d2..537ed411469 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
|
||||||
|
grub_TRANSFORM([grub-glue-efi.3])
|
||||||
|
grub_TRANSFORM([grub-install.1])
|
||||||
|
grub_TRANSFORM([grub-kbdcomp.3])
|
||||||
|
+grub_TRANSFORM([grub-macbless.8])
|
||||||
|
grub_TRANSFORM([grub-menulst2cfg.1])
|
||||||
|
grub_TRANSFORM([grub-mkconfig.1])
|
||||||
|
grub_TRANSFORM([grub-mkfont.3])
|
||||||
|
@@ -105,6 +106,7 @@ grub_TRANSFORM([grub-render-label.3])
|
||||||
|
grub_TRANSFORM([grub-script-check.3])
|
||||||
|
grub_TRANSFORM([grub-set-default.1])
|
||||||
|
grub_TRANSFORM([grub-sparc64-setup.3])
|
||||||
|
+grub_TRANSFORM([grub-syslinux2cfg.1])
|
||||||
|
|
||||||
|
# Optimization flag. Allow user to override.
|
||||||
|
if test "x$TARGET_CFLAGS" = x; then
|
||||||
|
diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..ae842f3a606
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-macbless.8
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+.TH GRUB-MACBLESS 1 "Wed Feb 26 2014"
|
||||||
|
+.SH NAME
|
||||||
|
+\fBgrub-macbless\fR \(em Mac-style bless utility for HFS or HFS+
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+\fBgrub-macbless\fR [-p | --ppc] [-v | --verbose] [-x | --x86] \fIFILE\fR
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBgrub-mkimage\fR blesses a file on an HFS or HFS+ file system, so that it
|
||||||
|
+can be used to boot a Mac.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP
|
||||||
|
+--ppc
|
||||||
|
+Bless the file for use on PPC-based Macs.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--verbose
|
||||||
|
+Print verbose messages.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--x86
|
||||||
|
+Bless the file for use on x86-based Macs.
|
||||||
|
+
|
||||||
|
+.SH SEE ALSO
|
||||||
|
+.BR "info grub"
|
||||||
|
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
|
||||||
|
index 4dea4f54597..0eaaafe505b 100644
|
||||||
|
--- a/util/grub-mkimage.1
|
||||||
|
+++ b/util/grub-mkimage.1
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
[-v | --verbose] \fIMODULES\fR
|
||||||
|
|
||||||
|
.SH DESCRIPTION
|
||||||
|
-\fBgrub-mkimage\fI builds a bootable image of GRUB.
|
||||||
|
+\fBgrub-mkimage\fR builds a bootable image of GRUB.
|
||||||
|
|
||||||
|
.SH OPTIONS
|
||||||
|
.TP
|
||||||
|
diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..85309482718
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-syslinux2cfg.1
|
||||||
|
@@ -0,0 +1,65 @@
|
||||||
|
+.TH GRUB-SYSLINUX2CFG 1 "Wed Feb 26 2014"
|
||||||
|
+.SH NAME
|
||||||
|
+\fBgrub-syslinux2cfg\fR \(em Transform a syslinux config file into a GRUB config.
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+\fBgrub-syslinux2cfg\fR [-c | --cwd=\fRDIR\fI] [-r | --root=\fIDIR\fR] [-v | --verbose]
|
||||||
|
+.RE
|
||||||
|
+.RS 25
|
||||||
|
+[-t | --target-root=\fIDIR\fR] [-T | --target-cwd=\fIDIR\fR]
|
||||||
|
+.RE
|
||||||
|
+.RS 25
|
||||||
|
+[-o | --output=\fIFILE\fR] [[-i | --isolinux] |
|
||||||
|
+.RE
|
||||||
|
+.RS 46
|
||||||
|
+ [-s | --syslinux] |
|
||||||
|
+.RE
|
||||||
|
+.RS 46
|
||||||
|
+ [-p | --pxelinux]] \fIFILE\fR
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBgrub-syslinux2cfg\fR builds a GRUB configuration file out of an existing
|
||||||
|
+syslinux configuration file.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP
|
||||||
|
+--cwd=\fIDIR\fR
|
||||||
|
+Set \fIDIR\fR as syslinux's working directory. The default is to use the
|
||||||
|
+parent directory of the input file.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--root=\fIDIR\fR
|
||||||
|
+Set \fIDIR\fR as the root directory of the syslinux disk. The default value
|
||||||
|
+is "/".
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--verbose
|
||||||
|
+Print verbose messages.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--target-root=\fIDIR\fR
|
||||||
|
+Root directory as it will be seen at runtime. The default value is "/".
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--target-cwd=\fIDIR\fR
|
||||||
|
+Working directory of syslinux as it will be seen at runtime. The default
|
||||||
|
+value is the parent directory of the input file.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--output=\fIFILE\fR
|
||||||
|
+Write the new config file to \fIFILE\fR. The default value is standard output.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--isolinux
|
||||||
|
+Assume that the input file is an isolinux configuration file.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--pxelinux
|
||||||
|
+Assume that the input file is a pxelinux configuration file.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--syslinux
|
||||||
|
+Assume that the input file is a syslinux configuration file.
|
||||||
|
+
|
||||||
|
+.SH SEE ALSO
|
||||||
|
+.BR "info grub"
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,124 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Wed, 24 May 2017 12:42:32 -0400
|
||||||
|
Subject: [PATCH] macos: just build chainloader entries, don't try any xnu xnu.
|
||||||
|
|
||||||
|
Since our bugs tell us that the xnu boot entries really just don't work
|
||||||
|
most of the time, and they create piles of extra boot entries, because
|
||||||
|
they can't quite figure out 32-vs-64 and other stuff like that.
|
||||||
|
|
||||||
|
It's rediculous, and we should just boot their bootloader through the
|
||||||
|
chainloader instead.
|
||||||
|
|
||||||
|
So this patch does that.
|
||||||
|
|
||||||
|
Resolves: rhbz#893179
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub.d/30_os-prober.in | 78 +++++++++++----------------------------------
|
||||||
|
1 file changed, 18 insertions(+), 60 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
||||||
|
index 1b91c102f35..4b27bd20153 100644
|
||||||
|
--- a/util/grub.d/30_os-prober.in
|
||||||
|
+++ b/util/grub.d/30_os-prober.in
|
||||||
|
@@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
osx_entry() {
|
||||||
|
- if [ x$2 = x32 ]; then
|
||||||
|
- # TRANSLATORS: it refers to kernel architecture (32-bit)
|
||||||
|
- bitstr="$(gettext "(32-bit)")"
|
||||||
|
- else
|
||||||
|
- # TRANSLATORS: it refers to kernel architecture (64-bit)
|
||||||
|
- bitstr="$(gettext "(64-bit)")"
|
||||||
|
- fi
|
||||||
|
# TRANSLATORS: it refers on the OS residing on device %s
|
||||||
|
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
||||||
|
- cat << EOF
|
||||||
|
-menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' {
|
||||||
|
+ hints=""
|
||||||
|
+ for hint in `"${grub_probe}" --device ${device} --target=efi_hints 2> /dev/null` ; do
|
||||||
|
+ hints="${hints} --hint=${hint}"
|
||||||
|
+ done
|
||||||
|
+ cat << EOF
|
||||||
|
+menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' {
|
||||||
|
EOF
|
||||||
|
save_default_entry | grub_add_tab
|
||||||
|
prepare_grub_to_access_device ${DEVICE} | grub_add_tab
|
||||||
|
cat << EOF
|
||||||
|
+ set gfxpayload=keep
|
||||||
|
load_video
|
||||||
|
- set do_resume=0
|
||||||
|
- if [ /var/vm/sleepimage -nt10 / ]; then
|
||||||
|
- if xnu_resume /var/vm/sleepimage; then
|
||||||
|
- set do_resume=1
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- if [ \$do_resume = 0 ]; then
|
||||||
|
- xnu_uuid ${OSXUUID} uuid
|
||||||
|
- if [ -f /Extra/DSDT.aml ]; then
|
||||||
|
- acpi -e /Extra/DSDT.aml
|
||||||
|
- fi
|
||||||
|
- if [ /kernelcache -nt /System/Library/Extensions ]; then
|
||||||
|
- $1 /kernelcache boot-uuid=\${uuid} rd=*uuid
|
||||||
|
- elif [ -f /System/Library/Kernels/kernel ]; then
|
||||||
|
- $1 /System/Library/Kernels/kernel boot-uuid=\${uuid} rd=*uuid
|
||||||
|
- xnu_kextdir /System/Library/Extensions
|
||||||
|
- else
|
||||||
|
- $1 /mach_kernel boot-uuid=\${uuid} rd=*uuid
|
||||||
|
- if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
|
||||||
|
- xnu_mkext /System/Library/Extensions.mkext
|
||||||
|
- else
|
||||||
|
- xnu_kextdir /System/Library/Extensions
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- if [ -f /Extra/Extensions.mkext ]; then
|
||||||
|
- xnu_mkext /Extra/Extensions.mkext
|
||||||
|
- fi
|
||||||
|
- if [ -d /Extra/Extensions ]; then
|
||||||
|
- xnu_kextdir /Extra/Extensions
|
||||||
|
- fi
|
||||||
|
- if [ -f /Extra/devprop.bin ]; then
|
||||||
|
- xnu_devprop_load /Extra/devprop.bin
|
||||||
|
- fi
|
||||||
|
- if [ -f /Extra/splash.jpg ]; then
|
||||||
|
- insmod jpeg
|
||||||
|
- xnu_splash /Extra/splash.jpg
|
||||||
|
- fi
|
||||||
|
- if [ -f /Extra/splash.png ]; then
|
||||||
|
- insmod png
|
||||||
|
- xnu_splash /Extra/splash.png
|
||||||
|
- fi
|
||||||
|
- if [ -f /Extra/splash.tga ]; then
|
||||||
|
- insmod tga
|
||||||
|
- xnu_splash /Extra/splash.tga
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
+ insmod part_gpt
|
||||||
|
+ insmod hfsplus
|
||||||
|
+ search --no-floppy --fs-uuid --set=root ${hints} $(grub_get_device_id "${DEVICE}")
|
||||||
|
+ chainloader (\$root)/System/Library/CoreServices/boot.efi
|
||||||
|
+ boot
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
@@ -292,11 +249,12 @@ EOF
|
||||||
|
echo "$title_correction_code"
|
||||||
|
;;
|
||||||
|
macosx)
|
||||||
|
- if [ "${UUID}" ]; then
|
||||||
|
- OSXUUID="${UUID}"
|
||||||
|
- osx_entry xnu_kernel 32
|
||||||
|
- osx_entry xnu_kernel64 64
|
||||||
|
- fi
|
||||||
|
+ for subdevice in ${DEVICE%[[:digit:]]*}* ; do
|
||||||
|
+ parttype="`"${grub_probe}" --device ${device} --target=gpt_parttype "${subdevice}" 2> /dev/null`"
|
||||||
|
+ if [[ "$parttype" = "426f6f74-0000-11aa-aa11-00306543ecac" ]]; then
|
||||||
|
+ DEVICE="${subdevice}" osx_entry
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
;;
|
||||||
|
hurd)
|
||||||
|
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
||||||
@ -0,0 +1,703 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeff Mahoney <jeffm@suse.com>
|
||||||
|
Date: Tue, 9 Jul 2019 13:39:45 +0200
|
||||||
|
Subject: [PATCH] grub2/btrfs: Add ability to boot from subvolumes
|
||||||
|
|
||||||
|
This patch adds the ability to specify a different root on a btrfs
|
||||||
|
filesystem too boot from other than the default one.
|
||||||
|
|
||||||
|
btrfs-list-snapshots <dev> will list the subvolumes available on the
|
||||||
|
filesystem.
|
||||||
|
|
||||||
|
set btrfs_subvol=<path> and set btrfs_subvolid=<subvolid> will specify
|
||||||
|
which subvolume to use and any pathnames provided with either of those
|
||||||
|
variables set will start using that root. If the subvolume or subvolume id
|
||||||
|
doesn't exist, then an error case will result.
|
||||||
|
|
||||||
|
It is possible to boot into a separate GRUB instance by exporting the
|
||||||
|
variable and loading the config file from the subvolume.
|
||||||
|
|
||||||
|
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 552 +++++++++++++++++++++++++++++++++++++++++++++++++--
|
||||||
|
include/grub/btrfs.h | 1 +
|
||||||
|
2 files changed, 533 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index 63203034dfc..f1fff7385b5 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -38,6 +38,9 @@
|
||||||
|
#include <zstd.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/btrfs.h>
|
||||||
|
+#include <grub/command.h>
|
||||||
|
+#include <grub/env.h>
|
||||||
|
+#include <grub/extcmd.h>
|
||||||
|
#include <grub/crypto.h>
|
||||||
|
#include <grub/diskfilter.h>
|
||||||
|
#include <grub/safemath.h>
|
||||||
|
@@ -79,9 +82,11 @@ struct grub_btrfs_superblock
|
||||||
|
grub_uint64_t generation;
|
||||||
|
grub_uint64_t root_tree;
|
||||||
|
grub_uint64_t chunk_tree;
|
||||||
|
- grub_uint8_t dummy2[0x20];
|
||||||
|
+ grub_uint8_t dummy2[0x18];
|
||||||
|
+ grub_uint64_t bytes_used;
|
||||||
|
grub_uint64_t root_dir_objectid;
|
||||||
|
- grub_uint8_t dummy3[0x41];
|
||||||
|
+ grub_uint64_t num_devices;
|
||||||
|
+ grub_uint8_t dummy3[0x39];
|
||||||
|
struct grub_btrfs_device this_device;
|
||||||
|
char label[0x100];
|
||||||
|
grub_uint8_t dummy4[0x100];
|
||||||
|
@@ -121,6 +126,7 @@ struct grub_btrfs_data
|
||||||
|
grub_uint64_t exttree;
|
||||||
|
grub_size_t extsize;
|
||||||
|
struct grub_btrfs_extent_data *extent;
|
||||||
|
+ grub_uint64_t fs_tree;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct grub_btrfs_chunk_item
|
||||||
|
@@ -191,6 +197,14 @@ struct grub_btrfs_leaf_descriptor
|
||||||
|
} *data;
|
||||||
|
};
|
||||||
|
|
||||||
|
+struct grub_btrfs_root_ref
|
||||||
|
+{
|
||||||
|
+ grub_uint64_t dirid;
|
||||||
|
+ grub_uint64_t sequence;
|
||||||
|
+ grub_uint16_t name_len;
|
||||||
|
+ const char name[0];
|
||||||
|
+} __attribute__ ((packed));
|
||||||
|
+
|
||||||
|
struct grub_btrfs_time
|
||||||
|
{
|
||||||
|
grub_int64_t sec;
|
||||||
|
@@ -236,6 +250,14 @@ struct grub_btrfs_extent_data
|
||||||
|
|
||||||
|
#define GRUB_BTRFS_OBJECT_ID_CHUNK 0x100
|
||||||
|
|
||||||
|
+#define GRUB_BTRFS_ROOT_TREE_OBJECTID 1ULL
|
||||||
|
+#define GRUB_BTRFS_FS_TREE_OBJECTID 5ULL
|
||||||
|
+#define GRUB_BTRFS_ROOT_REF_KEY 156
|
||||||
|
+#define GRUB_BTRFS_ROOT_ITEM_KEY 132
|
||||||
|
+
|
||||||
|
+static grub_uint64_t btrfs_default_subvolid = 0;
|
||||||
|
+static char *btrfs_default_subvol = NULL;
|
||||||
|
+
|
||||||
|
static grub_disk_addr_t superblock_sectors[] = { 64 * 2, 64 * 1024 * 2,
|
||||||
|
256 * 1048576 * 2, 1048576ULL * 1048576ULL * 2
|
||||||
|
};
|
||||||
|
@@ -1173,6 +1195,62 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
|
||||||
|
return GRUB_ERR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static grub_err_t
|
||||||
|
+get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree,
|
||||||
|
+ grub_uint64_t objectid, grub_uint64_t offset,
|
||||||
|
+ grub_uint64_t *fs_root);
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+lookup_root_by_id(struct grub_btrfs_data *data, grub_uint64_t id)
|
||||||
|
+{
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ grub_uint64_t tree;
|
||||||
|
+
|
||||||
|
+ err = get_fs_root(data, data->sblock.root_tree, id, -1, &tree);
|
||||||
|
+ if (!err)
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+find_path (struct grub_btrfs_data *data,
|
||||||
|
+ const char *path, struct grub_btrfs_key *key,
|
||||||
|
+ grub_uint64_t *tree, grub_uint8_t *type);
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
|
||||||
|
+{
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ grub_uint64_t tree = 0;
|
||||||
|
+ grub_uint8_t type;
|
||||||
|
+ struct grub_btrfs_key key;
|
||||||
|
+
|
||||||
|
+ err = find_path (data, path, &key, &tree, &type);
|
||||||
|
+ if (err)
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
|
||||||
|
+
|
||||||
|
+ if (key.object_id != grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK) || tree == 0)
|
||||||
|
+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, "%s: not a subvolume\n", path);
|
||||||
|
+
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+btrfs_handle_subvol(struct grub_btrfs_data *data __attribute__ ((unused)))
|
||||||
|
+{
|
||||||
|
+ if (btrfs_default_subvol)
|
||||||
|
+ return lookup_root_by_name(data, btrfs_default_subvol);
|
||||||
|
+
|
||||||
|
+ if (btrfs_default_subvolid)
|
||||||
|
+ return lookup_root_by_id(data, btrfs_default_subvolid);
|
||||||
|
+
|
||||||
|
+ data->fs_tree = 0;
|
||||||
|
+
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
static struct grub_btrfs_data *
|
||||||
|
grub_btrfs_mount (grub_device_t dev)
|
||||||
|
{
|
||||||
|
@@ -1208,6 +1286,13 @@ grub_btrfs_mount (grub_device_t dev)
|
||||||
|
data->devices_attached[0].dev = dev;
|
||||||
|
data->devices_attached[0].id = data->sblock.this_device.device_id;
|
||||||
|
|
||||||
|
+ err = btrfs_handle_subvol (data);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (data);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1673,6 +1758,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
|
||||||
|
return GRUB_ERR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static grub_err_t
|
||||||
|
+find_pathname(struct grub_btrfs_data *data, grub_uint64_t objectid,
|
||||||
|
+ grub_uint64_t fs_root, const char *name, char **pathname)
|
||||||
|
+{
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ struct grub_btrfs_key key = {
|
||||||
|
+ .object_id = objectid,
|
||||||
|
+ .type = GRUB_BTRFS_ITEM_TYPE_INODE_REF,
|
||||||
|
+ .offset = 0,
|
||||||
|
+ };
|
||||||
|
+ struct grub_btrfs_key key_out;
|
||||||
|
+ struct grub_btrfs_leaf_descriptor desc;
|
||||||
|
+ char *p = grub_strdup (name);
|
||||||
|
+ grub_disk_addr_t elemaddr;
|
||||||
|
+ grub_size_t elemsize;
|
||||||
|
+ grub_size_t alloc = grub_strlen(name) + 1;
|
||||||
|
+
|
||||||
|
+ err = lower_bound(data, &key, &key_out, fs_root,
|
||||||
|
+ &elemaddr, &elemsize, &desc, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ return grub_error(err, "lower_bound caught %d\n", err);
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_INODE_REF)
|
||||||
|
+ next(data, &desc, &elemaddr, &elemsize, &key_out);
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_INODE_REF)
|
||||||
|
+ {
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND,
|
||||||
|
+ "Can't find inode ref for {%"PRIuGRUB_UINT64_T
|
||||||
|
+ ", %u, %"PRIuGRUB_UINT64_T"} %"PRIuGRUB_UINT64_T
|
||||||
|
+ "/%"PRIuGRUB_SIZE"\n",
|
||||||
|
+ key_out.object_id, key_out.type,
|
||||||
|
+ key_out.offset, elemaddr, elemsize);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ while (key_out.type == GRUB_BTRFS_ITEM_TYPE_INODE_REF &&
|
||||||
|
+ key_out.object_id != key_out.offset) {
|
||||||
|
+ struct grub_btrfs_inode_ref *inode_ref;
|
||||||
|
+ char *new;
|
||||||
|
+
|
||||||
|
+ inode_ref = grub_malloc(elemsize + 1);
|
||||||
|
+ if (!inode_ref)
|
||||||
|
+ return grub_error(GRUB_ERR_OUT_OF_MEMORY,
|
||||||
|
+ "couldn't allocate memory for inode_ref (%"PRIuGRUB_SIZE")\n", elemsize);
|
||||||
|
+
|
||||||
|
+ err = grub_btrfs_read_logical(data, elemaddr, inode_ref, elemsize, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ return grub_error(err, "read_logical caught %d\n", err);
|
||||||
|
+
|
||||||
|
+ alloc += grub_le_to_cpu16 (inode_ref->n) + 2;
|
||||||
|
+ new = grub_malloc(alloc);
|
||||||
|
+ if (!new)
|
||||||
|
+ return grub_error(GRUB_ERR_OUT_OF_MEMORY,
|
||||||
|
+ "couldn't allocate memory for name (%"PRIuGRUB_SIZE")\n", alloc);
|
||||||
|
+
|
||||||
|
+ grub_memcpy(new, inode_ref->name, grub_le_to_cpu16 (inode_ref->n));
|
||||||
|
+ if (p)
|
||||||
|
+ {
|
||||||
|
+ new[grub_le_to_cpu16 (inode_ref->n)] = '/';
|
||||||
|
+ grub_strcpy (new + grub_le_to_cpu16 (inode_ref->n) + 1, p);
|
||||||
|
+ grub_free(p);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ new[grub_le_to_cpu16 (inode_ref->n)] = 0;
|
||||||
|
+ grub_free(inode_ref);
|
||||||
|
+
|
||||||
|
+ p = new;
|
||||||
|
+
|
||||||
|
+ key.object_id = key_out.offset;
|
||||||
|
+
|
||||||
|
+ err = lower_bound(data, &key, &key_out, fs_root, &elemaddr,
|
||||||
|
+ &elemsize, &desc, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ return grub_error(err, "lower_bound caught %d\n", err);
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_INODE_REF)
|
||||||
|
+ next(data, &desc, &elemaddr, &elemsize, &key_out);
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ *pathname = p;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static grub_err_t
|
||||||
|
find_path (struct grub_btrfs_data *data,
|
||||||
|
const char *path, struct grub_btrfs_key *key,
|
||||||
|
@@ -1691,14 +1861,26 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
char *origpath = NULL;
|
||||||
|
unsigned symlinks_max = 32;
|
||||||
|
|
||||||
|
- err = get_root (data, key, tree, type);
|
||||||
|
- if (err)
|
||||||
|
- return err;
|
||||||
|
-
|
||||||
|
origpath = grub_strdup (path);
|
||||||
|
if (!origpath)
|
||||||
|
return grub_errno;
|
||||||
|
|
||||||
|
+ if (data->fs_tree)
|
||||||
|
+ {
|
||||||
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
+ *tree = data->fs_tree;
|
||||||
|
+ /* This is a tree root, so everything starts at objectid 256 */
|
||||||
|
+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
||||||
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key->offset = 0;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ err = get_root (data, key, tree, type);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
while (path[0] == '/')
|
||||||
|
@@ -1871,9 +2053,21 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
path = path_alloc = tmp;
|
||||||
|
if (path[0] == '/')
|
||||||
|
{
|
||||||
|
- err = get_root (data, key, tree, type);
|
||||||
|
- if (err)
|
||||||
|
- return err;
|
||||||
|
+ if (data->fs_tree)
|
||||||
|
+ {
|
||||||
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
+ *tree = data->fs_tree;
|
||||||
|
+ /* This is a tree root, so everything starts at objectid 256 */
|
||||||
|
+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
||||||
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key->offset = 0;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ err = get_root (data, key, tree, type);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
@@ -2114,18 +2308,10 @@ grub_btrfs_read (grub_file_t file, char *buf, grub_size_t len)
|
||||||
|
data->tree, file->offset, buf, len);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static grub_err_t
|
||||||
|
-grub_btrfs_uuid (grub_device_t device, char **uuid)
|
||||||
|
+static char *
|
||||||
|
+btrfs_unparse_uuid(struct grub_btrfs_data *data)
|
||||||
|
{
|
||||||
|
- struct grub_btrfs_data *data;
|
||||||
|
-
|
||||||
|
- *uuid = NULL;
|
||||||
|
-
|
||||||
|
- data = grub_btrfs_mount (device);
|
||||||
|
- if (!data)
|
||||||
|
- return grub_errno;
|
||||||
|
-
|
||||||
|
- *uuid = grub_xasprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
|
||||||
|
+ return grub_xasprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
|
||||||
|
grub_be_to_cpu16 (data->sblock.uuid[0]),
|
||||||
|
grub_be_to_cpu16 (data->sblock.uuid[1]),
|
||||||
|
grub_be_to_cpu16 (data->sblock.uuid[2]),
|
||||||
|
@@ -2134,6 +2320,20 @@ grub_btrfs_uuid (grub_device_t device, char **uuid)
|
||||||
|
grub_be_to_cpu16 (data->sblock.uuid[5]),
|
||||||
|
grub_be_to_cpu16 (data->sblock.uuid[6]),
|
||||||
|
grub_be_to_cpu16 (data->sblock.uuid[7]));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_btrfs_uuid (grub_device_t device, char **uuid)
|
||||||
|
+{
|
||||||
|
+ struct grub_btrfs_data *data;
|
||||||
|
+
|
||||||
|
+ *uuid = NULL;
|
||||||
|
+
|
||||||
|
+ data = grub_btrfs_mount (device);
|
||||||
|
+ if (!data)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ *uuid = btrfs_unparse_uuid(data);
|
||||||
|
|
||||||
|
grub_btrfs_unmount (data);
|
||||||
|
|
||||||
|
@@ -2190,6 +2390,242 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
|
||||||
|
+ char **argv)
|
||||||
|
+{
|
||||||
|
+ grub_device_t dev;
|
||||||
|
+ char *devname;
|
||||||
|
+ struct grub_btrfs_data *data;
|
||||||
|
+ char *uuid;
|
||||||
|
+
|
||||||
|
+ if (argc < 1)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
|
||||||
|
+
|
||||||
|
+ devname = grub_file_get_device_name(argv[0]);
|
||||||
|
+
|
||||||
|
+ if (!devname)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ dev = grub_device_open (devname);
|
||||||
|
+ grub_free (devname);
|
||||||
|
+ if (!dev)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ data = grub_btrfs_mount (dev);
|
||||||
|
+ if (!data)
|
||||||
|
+ {
|
||||||
|
+ grub_device_close(dev);
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "failed to open fs");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (data->sblock.label)
|
||||||
|
+ grub_printf("Label: '%s' ", data->sblock.label);
|
||||||
|
+ else
|
||||||
|
+ grub_printf("Label: none ");
|
||||||
|
+
|
||||||
|
+ uuid = btrfs_unparse_uuid(data);
|
||||||
|
+
|
||||||
|
+ grub_printf(" uuid: %s\n\tTotal devices %" PRIuGRUB_UINT64_T
|
||||||
|
+ " FS bytes used %" PRIuGRUB_UINT64_T "\n",
|
||||||
|
+ uuid, grub_cpu_to_le64(data->sblock.num_devices),
|
||||||
|
+ grub_cpu_to_le64(data->sblock.bytes_used));
|
||||||
|
+
|
||||||
|
+ grub_btrfs_unmount (data);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree,
|
||||||
|
+ grub_uint64_t objectid, grub_uint64_t offset,
|
||||||
|
+ grub_uint64_t *fs_root)
|
||||||
|
+{
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ struct grub_btrfs_key key_in = {
|
||||||
|
+ .object_id = objectid,
|
||||||
|
+ .type = GRUB_BTRFS_ROOT_ITEM_KEY,
|
||||||
|
+ .offset = offset,
|
||||||
|
+ }, key_out;
|
||||||
|
+ struct grub_btrfs_leaf_descriptor desc;
|
||||||
|
+ grub_disk_addr_t elemaddr;
|
||||||
|
+ grub_size_t elemsize;
|
||||||
|
+ struct grub_btrfs_root_item ri;
|
||||||
|
+
|
||||||
|
+ err = lower_bound(data, &key_in, &key_out, tree,
|
||||||
|
+ &elemaddr, &elemsize, &desc, 0);
|
||||||
|
+
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM || elemaddr == 0)
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND,
|
||||||
|
+ N_("can't find fs root for subvol %"PRIuGRUB_UINT64_T"\n"),
|
||||||
|
+ key_in.object_id);
|
||||||
|
+
|
||||||
|
+ err = grub_btrfs_read_logical (data, elemaddr, &ri, sizeof (ri), 0);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ *fs_root = ri.tree;
|
||||||
|
+
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct grub_arg_option options[] = {
|
||||||
|
+ {"output", 'o', 0, N_("Output to a variable instead of the console."),
|
||||||
|
+ N_("VARNAME"), ARG_TYPE_STRING},
|
||||||
|
+ {"path-only", 'p', 0, N_("Show only the path of the subvolume."), 0, 0},
|
||||||
|
+ {"id-only", 'i', 0, N_("Show only the id of the subvolume."), 0, 0},
|
||||||
|
+ {0, 0, 0, 0, 0, 0}
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_cmd_btrfs_list_subvols (struct grub_extcmd_context *ctxt,
|
||||||
|
+ int argc, char **argv)
|
||||||
|
+{
|
||||||
|
+ struct grub_btrfs_data *data;
|
||||||
|
+ grub_device_t dev;
|
||||||
|
+ char *devname;
|
||||||
|
+ grub_uint64_t tree;
|
||||||
|
+ struct grub_btrfs_key key_in = {
|
||||||
|
+ .object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_FS_TREE_OBJECTID),
|
||||||
|
+ .type = GRUB_BTRFS_ROOT_REF_KEY,
|
||||||
|
+ .offset = 0,
|
||||||
|
+ }, key_out;
|
||||||
|
+ struct grub_btrfs_leaf_descriptor desc;
|
||||||
|
+ grub_disk_addr_t elemaddr;
|
||||||
|
+ grub_uint64_t fs_root = 0;
|
||||||
|
+ grub_size_t elemsize;
|
||||||
|
+ grub_size_t allocated = 0;
|
||||||
|
+ int r = 0;
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ char *buf = NULL;
|
||||||
|
+ int print = 1;
|
||||||
|
+ int path_only = ctxt->state[1].set;
|
||||||
|
+ int num_only = ctxt->state[2].set;
|
||||||
|
+ char *varname = NULL;
|
||||||
|
+ char *output = NULL;
|
||||||
|
+
|
||||||
|
+ if (ctxt->state[0].set) {
|
||||||
|
+ varname = ctxt->state[0].arg;
|
||||||
|
+ print = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (argc < 1)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
|
||||||
|
+
|
||||||
|
+ devname = grub_file_get_device_name(argv[0]);
|
||||||
|
+ if (!devname)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ dev = grub_device_open (devname);
|
||||||
|
+ grub_free (devname);
|
||||||
|
+ if (!dev)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ data = grub_btrfs_mount(dev);
|
||||||
|
+ if (!data)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "could not open device");
|
||||||
|
+
|
||||||
|
+ tree = data->sblock.root_tree;
|
||||||
|
+ err = get_fs_root(data, tree, grub_cpu_to_le64_compile_time (GRUB_BTRFS_FS_TREE_OBJECTID),
|
||||||
|
+ 0, &fs_root);
|
||||||
|
+ if (err)
|
||||||
|
+ goto out;
|
||||||
|
+
|
||||||
|
+ err = lower_bound(data, &key_in, &key_out, tree,
|
||||||
|
+ &elemaddr, &elemsize, &desc, 0);
|
||||||
|
+
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_btrfs_unmount(data);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_REF || elemaddr == 0)
|
||||||
|
+ {
|
||||||
|
+ r = next(data, &desc, &elemaddr, &elemsize, &key_out);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_REF) {
|
||||||
|
+ err = GRUB_ERR_FILE_NOT_FOUND;
|
||||||
|
+ grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("can't find root refs"));
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ do
|
||||||
|
+ {
|
||||||
|
+ struct grub_btrfs_root_ref *ref;
|
||||||
|
+ char *p = NULL;
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_REF)
|
||||||
|
+ {
|
||||||
|
+ r = 0;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (elemsize > allocated)
|
||||||
|
+ {
|
||||||
|
+ grub_free(buf);
|
||||||
|
+ allocated = 2 * elemsize;
|
||||||
|
+ buf = grub_malloc(allocated + 1);
|
||||||
|
+ if (!buf)
|
||||||
|
+ {
|
||||||
|
+ r = -grub_errno;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ref = (struct grub_btrfs_root_ref *)buf;
|
||||||
|
+
|
||||||
|
+ err = grub_btrfs_read_logical(data, elemaddr, buf, elemsize, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ r = -err;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ buf[elemsize] = 0;
|
||||||
|
+
|
||||||
|
+ find_pathname(data, ref->dirid, fs_root, ref->name, &p);
|
||||||
|
+
|
||||||
|
+ if (print)
|
||||||
|
+ {
|
||||||
|
+ if (num_only)
|
||||||
|
+ grub_printf("ID %"PRIuGRUB_UINT64_T"\n", key_out.offset);
|
||||||
|
+ else if (path_only)
|
||||||
|
+ grub_printf("%s\n", p);
|
||||||
|
+ else
|
||||||
|
+ grub_printf("ID %"PRIuGRUB_UINT64_T" path %s\n", key_out.offset, p);
|
||||||
|
+ } else {
|
||||||
|
+ char *old = output;
|
||||||
|
+ if (num_only)
|
||||||
|
+ output = grub_xasprintf("%s%"PRIuGRUB_UINT64_T"\n",
|
||||||
|
+ old ?: "", key_out.offset);
|
||||||
|
+ else if (path_only)
|
||||||
|
+ output = grub_xasprintf("%s%s\n", old ?: "", p);
|
||||||
|
+ else
|
||||||
|
+ output = grub_xasprintf("%sID %"PRIuGRUB_UINT64_T" path %s\n",
|
||||||
|
+ old ?: "", key_out.offset, p);
|
||||||
|
+
|
||||||
|
+ if (old)
|
||||||
|
+ grub_free(old);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ r = next(data, &desc, &elemaddr, &elemsize, &key_out);
|
||||||
|
+ } while(r > 0);
|
||||||
|
+
|
||||||
|
+ if (output)
|
||||||
|
+ grub_env_set(varname, output);
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ free_iterator(&desc);
|
||||||
|
+ grub_btrfs_unmount(data);
|
||||||
|
+
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static struct grub_fs grub_btrfs_fs = {
|
||||||
|
.name = "btrfs",
|
||||||
|
.fs_dir = grub_btrfs_dir,
|
||||||
|
@@ -2205,12 +2641,88 @@ static struct grub_fs grub_btrfs_fs = {
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
+static grub_command_t cmd_info;
|
||||||
|
+static grub_extcmd_t cmd_list_subvols;
|
||||||
|
+
|
||||||
|
+static char *
|
||||||
|
+subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
|
||||||
|
+ const char *val)
|
||||||
|
+{
|
||||||
|
+ unsigned long long result = 0;
|
||||||
|
+
|
||||||
|
+ grub_errno = GRUB_ERR_NONE;
|
||||||
|
+ if (*val)
|
||||||
|
+ {
|
||||||
|
+ result = grub_strtoull(val, NULL, 10);
|
||||||
|
+ if (grub_errno)
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_free (btrfs_default_subvol);
|
||||||
|
+ btrfs_default_subvol = NULL;
|
||||||
|
+ btrfs_default_subvolid = result;
|
||||||
|
+ return grub_strdup(val);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const char *
|
||||||
|
+subvolid_get_env (struct grub_env_var *var __attribute__ ((unused)),
|
||||||
|
+ const char *val __attribute__ ((unused)))
|
||||||
|
+{
|
||||||
|
+ if (btrfs_default_subvol)
|
||||||
|
+ return grub_xasprintf("subvol:%s", btrfs_default_subvol);
|
||||||
|
+ else if (btrfs_default_subvolid)
|
||||||
|
+ return grub_xasprintf("%"PRIuGRUB_UINT64_T, btrfs_default_subvolid);
|
||||||
|
+ else
|
||||||
|
+ return "";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static char *
|
||||||
|
+subvol_set_env (struct grub_env_var *var __attribute__ ((unused)),
|
||||||
|
+ const char *val)
|
||||||
|
+{
|
||||||
|
+ grub_free (btrfs_default_subvol);
|
||||||
|
+ btrfs_default_subvol = grub_strdup (val);
|
||||||
|
+ btrfs_default_subvolid = 0;
|
||||||
|
+ return grub_strdup(val);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const char *
|
||||||
|
+subvol_get_env (struct grub_env_var *var __attribute__ ((unused)),
|
||||||
|
+ const char *val __attribute__ ((unused)))
|
||||||
|
+{
|
||||||
|
+ if (btrfs_default_subvol)
|
||||||
|
+ return btrfs_default_subvol;
|
||||||
|
+ else if (btrfs_default_subvolid)
|
||||||
|
+ return grub_xasprintf("subvolid:%" PRIuGRUB_UINT64_T,
|
||||||
|
+ btrfs_default_subvolid);
|
||||||
|
+ else
|
||||||
|
+ return "";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
GRUB_MOD_INIT (btrfs)
|
||||||
|
{
|
||||||
|
grub_fs_register (&grub_btrfs_fs);
|
||||||
|
+ cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
|
||||||
|
+ "DEVICE",
|
||||||
|
+ "Print BtrFS info about DEVICE.");
|
||||||
|
+ cmd_list_subvols = grub_register_extcmd("btrfs-list-subvols",
|
||||||
|
+ grub_cmd_btrfs_list_subvols, 0,
|
||||||
|
+ "[-p|-n] [-o var] DEVICE",
|
||||||
|
+ "Print list of BtrFS subvolumes on "
|
||||||
|
+ "DEVICE.", options);
|
||||||
|
+ grub_register_variable_hook ("btrfs_subvol", subvol_get_env,
|
||||||
|
+ subvol_set_env);
|
||||||
|
+ grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
|
||||||
|
+ subvolid_set_env);
|
||||||
|
}
|
||||||
|
|
||||||
|
GRUB_MOD_FINI (btrfs)
|
||||||
|
{
|
||||||
|
+ grub_register_variable_hook ("btrfs_subvol", NULL, NULL);
|
||||||
|
+ grub_register_variable_hook ("btrfs_subvolid", NULL, NULL);
|
||||||
|
+ grub_unregister_command (cmd_info);
|
||||||
|
+ grub_unregister_extcmd (cmd_list_subvols);
|
||||||
|
grub_fs_unregister (&grub_btrfs_fs);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+// vim: si et sw=2:
|
||||||
|
diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h
|
||||||
|
index 9d93fb6c182..234ad976771 100644
|
||||||
|
--- a/include/grub/btrfs.h
|
||||||
|
+++ b/include/grub/btrfs.h
|
||||||
|
@@ -29,6 +29,7 @@ enum
|
||||||
|
GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM = 0x84,
|
||||||
|
GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF = 0x90,
|
||||||
|
GRUB_BTRFS_ITEM_TYPE_DEVICE = 0xd8,
|
||||||
|
+ GRUB_BTRFS_ITEM_TYPE_ROOT_REF = 0x9c,
|
||||||
|
GRUB_BTRFS_ITEM_TYPE_CHUNK = 0xe4
|
||||||
|
};
|
||||||
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Wed, 18 Dec 2013 09:57:04 +0000
|
||||||
|
Subject: [PATCH] export btrfs_subvol and btrfs_subvolid
|
||||||
|
|
||||||
|
We should export btrfs_subvol and btrfs_subvolid to have both visible
|
||||||
|
to subsidiary configuration files loaded using configfile.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index f1fff7385b5..ad1b56b716d 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs)
|
||||||
|
subvol_set_env);
|
||||||
|
grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
|
||||||
|
subvolid_set_env);
|
||||||
|
+ grub_env_export ("btrfs_subvol");
|
||||||
|
+ grub_env_export ("btrfs_subvolid");
|
||||||
|
}
|
||||||
|
|
||||||
|
GRUB_MOD_FINI (btrfs)
|
||||||
@ -0,0 +1,196 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Thu, 21 Aug 2014 03:39:11 +0000
|
||||||
|
Subject: [PATCH] grub2-btrfs-03-follow_default
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++---------------
|
||||||
|
1 file changed, 76 insertions(+), 31 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index ad1b56b716d..113c1f746c9 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev)
|
||||||
|
{
|
||||||
|
struct grub_btrfs_data *data;
|
||||||
|
grub_err_t err;
|
||||||
|
+ const char *relpath = grub_env_get ("btrfs_relative_path");
|
||||||
|
|
||||||
|
if (!dev->disk)
|
||||||
|
{
|
||||||
|
@@ -1286,11 +1287,14 @@ grub_btrfs_mount (grub_device_t dev)
|
||||||
|
data->devices_attached[0].dev = dev;
|
||||||
|
data->devices_attached[0].id = data->sblock.this_device.device_id;
|
||||||
|
|
||||||
|
- err = btrfs_handle_subvol (data);
|
||||||
|
- if (err)
|
||||||
|
+ if (relpath && (relpath[0] == '1' || relpath[0] == 'y'))
|
||||||
|
{
|
||||||
|
- grub_free (data);
|
||||||
|
- return NULL;
|
||||||
|
+ err = btrfs_handle_subvol (data);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (data);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
@@ -1855,24 +1859,39 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
grub_size_t allocated = 0;
|
||||||
|
struct grub_btrfs_dir_item *direl = NULL;
|
||||||
|
struct grub_btrfs_key key_out;
|
||||||
|
+ int follow_default;
|
||||||
|
const char *ctoken;
|
||||||
|
grub_size_t ctokenlen;
|
||||||
|
char *path_alloc = NULL;
|
||||||
|
char *origpath = NULL;
|
||||||
|
unsigned symlinks_max = 32;
|
||||||
|
+ const char *relpath = grub_env_get ("btrfs_relative_path");
|
||||||
|
|
||||||
|
+ follow_default = 0;
|
||||||
|
origpath = grub_strdup (path);
|
||||||
|
if (!origpath)
|
||||||
|
return grub_errno;
|
||||||
|
|
||||||
|
- if (data->fs_tree)
|
||||||
|
+ if (relpath && (relpath[0] == '1' || relpath[0] == 'y'))
|
||||||
|
{
|
||||||
|
- *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
- *tree = data->fs_tree;
|
||||||
|
- /* This is a tree root, so everything starts at objectid 256 */
|
||||||
|
- key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
||||||
|
- key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
- key->offset = 0;
|
||||||
|
+ if (data->fs_tree)
|
||||||
|
+ {
|
||||||
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
+ *tree = data->fs_tree;
|
||||||
|
+ /* This is a tree root, so everything starts at objectid 256 */
|
||||||
|
+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
||||||
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key->offset = 0;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
+ *tree = data->sblock.root_tree;
|
||||||
|
+ key->object_id = data->sblock.root_dir_objectid;
|
||||||
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key->offset = 0;
|
||||||
|
+ follow_default = 1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -1883,15 +1902,23 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
- while (path[0] == '/')
|
||||||
|
- path++;
|
||||||
|
- if (!path[0])
|
||||||
|
- break;
|
||||||
|
- slash = grub_strchr (path, '/');
|
||||||
|
- if (!slash)
|
||||||
|
- slash = path + grub_strlen (path);
|
||||||
|
- ctoken = path;
|
||||||
|
- ctokenlen = slash - path;
|
||||||
|
+ if (!follow_default)
|
||||||
|
+ {
|
||||||
|
+ while (path[0] == '/')
|
||||||
|
+ path++;
|
||||||
|
+ if (!path[0])
|
||||||
|
+ break;
|
||||||
|
+ slash = grub_strchr (path, '/');
|
||||||
|
+ if (!slash)
|
||||||
|
+ slash = path + grub_strlen (path);
|
||||||
|
+ ctoken = path;
|
||||||
|
+ ctokenlen = slash - path;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ ctoken = "default";
|
||||||
|
+ ctokenlen = sizeof ("default") - 1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (*type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
|
||||||
|
{
|
||||||
|
@@ -1902,7 +1929,9 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
|
||||||
|
if (ctokenlen == 1 && ctoken[0] == '.')
|
||||||
|
{
|
||||||
|
- path = slash;
|
||||||
|
+ if (!follow_default)
|
||||||
|
+ path = slash;
|
||||||
|
+ follow_default = 0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')
|
||||||
|
@@ -1933,8 +1962,9 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
*type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
key->object_id = key_out.offset;
|
||||||
|
|
||||||
|
- path = slash;
|
||||||
|
-
|
||||||
|
+ if (!follow_default)
|
||||||
|
+ path = slash;
|
||||||
|
+ follow_default = 0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2003,7 +2033,9 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
- path = slash;
|
||||||
|
+ if (!follow_default)
|
||||||
|
+ path = slash;
|
||||||
|
+ follow_default = 0;
|
||||||
|
if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)
|
||||||
|
{
|
||||||
|
struct grub_btrfs_inode inode;
|
||||||
|
@@ -2053,14 +2085,26 @@ find_path (struct grub_btrfs_data *data,
|
||||||
|
path = path_alloc = tmp;
|
||||||
|
if (path[0] == '/')
|
||||||
|
{
|
||||||
|
- if (data->fs_tree)
|
||||||
|
+ if (relpath && (relpath[0] == '1' || relpath[0] == 'y'))
|
||||||
|
{
|
||||||
|
- *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
- *tree = data->fs_tree;
|
||||||
|
- /* This is a tree root, so everything starts at objectid 256 */
|
||||||
|
- key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
||||||
|
- key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
- key->offset = 0;
|
||||||
|
+ if (data->fs_tree)
|
||||||
|
+ {
|
||||||
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
+ *tree = data->fs_tree;
|
||||||
|
+ /* This is a tree root, so everything starts at objectid 256 */
|
||||||
|
+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
||||||
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key->offset = 0;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
||||||
|
+ *tree = data->sblock.root_tree;
|
||||||
|
+ key->object_id = data->sblock.root_dir_objectid;
|
||||||
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key->offset = 0;
|
||||||
|
+ follow_default = 1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -2716,6 +2760,7 @@ GRUB_MOD_INIT (btrfs)
|
||||||
|
subvolid_set_env);
|
||||||
|
grub_env_export ("btrfs_subvol");
|
||||||
|
grub_env_export ("btrfs_subvolid");
|
||||||
|
+ grub_env_export ("btrfs_relative_path");
|
||||||
|
}
|
||||||
|
|
||||||
|
GRUB_MOD_FINI (btrfs)
|
||||||
@ -0,0 +1,174 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Thu, 21 Aug 2014 03:39:11 +0000
|
||||||
|
Subject: [PATCH] grub2-btrfs-04-grub2-install
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/osdep/linux/getroot.c | 7 +++++++
|
||||||
|
grub-core/osdep/unix/config.c | 17 +++++++++++++++--
|
||||||
|
util/config.c | 10 ++++++++++
|
||||||
|
util/grub-install.c | 15 +++++++++++++++
|
||||||
|
util/grub-mkrelpath.c | 6 ++++++
|
||||||
|
include/grub/emu/config.h | 1 +
|
||||||
|
6 files changed, 54 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
|
||||||
|
index 001b818fe58..caf9b1ccd3f 100644
|
||||||
|
--- a/grub-core/osdep/linux/getroot.c
|
||||||
|
+++ b/grub-core/osdep/linux/getroot.c
|
||||||
|
@@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int use_relative_path_on_btrfs = 0;
|
||||||
|
|
||||||
|
char **
|
||||||
|
grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
|
||||||
|
@@ -519,6 +520,12 @@ again:
|
||||||
|
{
|
||||||
|
ret = grub_find_root_devices_from_btrfs (dir);
|
||||||
|
fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path);
|
||||||
|
+ if (use_relative_path_on_btrfs)
|
||||||
|
+ {
|
||||||
|
+ if (fs_prefix)
|
||||||
|
+ free (fs_prefix);
|
||||||
|
+ fs_prefix = xstrdup ("/");
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
|
||||||
|
{
|
||||||
|
diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
|
||||||
|
index 7d6325138ce..46a881530c0 100644
|
||||||
|
--- a/grub-core/osdep/unix/config.c
|
||||||
|
+++ b/grub-core/osdep/unix/config.c
|
||||||
|
@@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
|
||||||
|
if (v)
|
||||||
|
cfg->grub_distributor = xstrdup (v);
|
||||||
|
|
||||||
|
+ v = getenv ("SUSE_BTRFS_SNAPSHOT_BOOTING");
|
||||||
|
+ if (v)
|
||||||
|
+ {
|
||||||
|
+ if (grub_strncmp(v, "true", sizeof ("true") - 1) == 0)
|
||||||
|
+ {
|
||||||
|
+ cfg->is_suse_btrfs_snapshot_enabled = 1;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ cfg->is_suse_btrfs_snapshot_enabled = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
cfgfile = grub_util_get_config_filename ();
|
||||||
|
if (!grub_util_is_regular (cfgfile))
|
||||||
|
return;
|
||||||
|
@@ -105,8 +118,8 @@ grub_util_load_config (struct grub_util_config *cfg)
|
||||||
|
*ptr++ = *iptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
- strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\" "
|
||||||
|
- "\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\"");
|
||||||
|
+ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\" "
|
||||||
|
+ "\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\" \"$SUSE_BTRFS_SNAPSHOT_BOOTING\"");
|
||||||
|
|
||||||
|
argv[2] = script;
|
||||||
|
argv[3] = '\0';
|
||||||
|
diff --git a/util/config.c b/util/config.c
|
||||||
|
index ebcdd8f5e22..f044a880a76 100644
|
||||||
|
--- a/util/config.c
|
||||||
|
+++ b/util/config.c
|
||||||
|
@@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
|
||||||
|
cfg->is_cryptodisk_enabled = 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
+ if (grub_strncmp (ptr, "SUSE_BTRFS_SNAPSHOT_BOOTING=",
|
||||||
|
+ sizeof ("SUSE_BTRFS_SNAPSHOT_BOOTING=") - 1) == 0)
|
||||||
|
+ {
|
||||||
|
+ ptr += sizeof ("SUSE_BTRFS_SNAPSHOT_BOOTING=") - 1;
|
||||||
|
+ if (*ptr == '"' || *ptr == '\'')
|
||||||
|
+ ptr++;
|
||||||
|
+ if (grub_strncmp(ptr, "true", sizeof ("true") - 1) == 0)
|
||||||
|
+ cfg->is_suse_btrfs_snapshot_enabled = 1;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
if (grub_strncmp (ptr, "GRUB_DISTRIBUTOR=",
|
||||||
|
sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
|
||||||
|
{
|
||||||
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
||||||
|
index 0fbe7f78c6d..0f66f36d23a 100644
|
||||||
|
--- a/util/grub-install.c
|
||||||
|
+++ b/util/grub-install.c
|
||||||
|
@@ -827,6 +827,8 @@ fill_core_services (const char *core_services)
|
||||||
|
free (sysv_plist);
|
||||||
|
}
|
||||||
|
|
||||||
|
+extern int use_relative_path_on_btrfs;
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main (int argc, char *argv[])
|
||||||
|
{
|
||||||
|
@@ -860,6 +862,9 @@ main (int argc, char *argv[])
|
||||||
|
|
||||||
|
grub_util_load_config (&config);
|
||||||
|
|
||||||
|
+ if (config.is_suse_btrfs_snapshot_enabled)
|
||||||
|
+ use_relative_path_on_btrfs = 1;
|
||||||
|
+
|
||||||
|
if (!bootloader_id && config.grub_distributor)
|
||||||
|
{
|
||||||
|
char *ptr;
|
||||||
|
@@ -1352,6 +1357,16 @@ main (int argc, char *argv[])
|
||||||
|
fprintf (load_cfg_f, "set debug='%s'\n",
|
||||||
|
debug_image);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (config.is_suse_btrfs_snapshot_enabled
|
||||||
|
+ && grub_strncmp(grub_fs->name, "btrfs", sizeof ("btrfs") - 1) == 0)
|
||||||
|
+ {
|
||||||
|
+ if (!load_cfg_f)
|
||||||
|
+ load_cfg_f = grub_util_fopen (load_cfg, "wb");
|
||||||
|
+ have_load_cfg = 1;
|
||||||
|
+ fprintf (load_cfg_f, "set btrfs_relative_path='y'\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
char *prefix_drive = NULL;
|
||||||
|
char *install_drive = NULL;
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
|
||||||
|
index 47a241a391b..5db7a9a7d97 100644
|
||||||
|
--- a/util/grub-mkrelpath.c
|
||||||
|
+++ b/util/grub-mkrelpath.c
|
||||||
|
@@ -40,9 +40,12 @@ struct arguments
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct argp_option options[] = {
|
||||||
|
+ {"relative", 'r', 0, 0, "use relative path on btrfs", 0},
|
||||||
|
{ 0, 0, 0, 0, 0, 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
+extern int use_relative_path_on_btrfs;
|
||||||
|
+
|
||||||
|
static error_t
|
||||||
|
argp_parser (int key, char *arg, struct argp_state *state)
|
||||||
|
{
|
||||||
|
@@ -52,6 +55,9 @@ argp_parser (int key, char *arg, struct argp_state *state)
|
||||||
|
|
||||||
|
switch (key)
|
||||||
|
{
|
||||||
|
+ case 'r':
|
||||||
|
+ use_relative_path_on_btrfs = 1;
|
||||||
|
+ break;
|
||||||
|
case ARGP_KEY_ARG:
|
||||||
|
if (state->arg_num == 0)
|
||||||
|
arguments->pathname = xstrdup (arg);
|
||||||
|
diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h
|
||||||
|
index 875d5896ce1..c9a7e5f4ade 100644
|
||||||
|
--- a/include/grub/emu/config.h
|
||||||
|
+++ b/include/grub/emu/config.h
|
||||||
|
@@ -37,6 +37,7 @@ struct grub_util_config
|
||||||
|
{
|
||||||
|
int is_cryptodisk_enabled;
|
||||||
|
char *grub_distributor;
|
||||||
|
+ int is_suse_btrfs_snapshot_enabled;
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
@ -0,0 +1,129 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Thu, 21 Aug 2014 03:39:11 +0000
|
||||||
|
Subject: [PATCH] grub2-btrfs-05-grub2-mkconfig
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
---
|
||||||
|
util/grub-mkconfig.in | 3 ++-
|
||||||
|
util/grub-mkconfig_lib.in | 4 ++++
|
||||||
|
util/grub.d/00_header.in | 25 ++++++++++++++++++++++++-
|
||||||
|
util/grub.d/10_linux.in | 4 ++++
|
||||||
|
util/grub.d/20_linux_xen.in | 4 ++++
|
||||||
|
5 files changed, 38 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index 005f093809b..535c0f02499 100644
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
|
||||||
|
GRUB_BADRAM \
|
||||||
|
GRUB_OS_PROBER_SKIP_LIST \
|
||||||
|
GRUB_DISABLE_SUBMENU \
|
||||||
|
- GRUB_DEFAULT_DTB
|
||||||
|
+ GRUB_DEFAULT_DTB \
|
||||||
|
+ SUSE_BTRFS_SNAPSHOT_BOOTING
|
||||||
|
|
||||||
|
if test "x${grub_cfg}" != "x"; then
|
||||||
|
rm -f "${grub_cfg}.new"
|
||||||
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
||||||
|
index 42c2ea9ba50..fafeac95061 100644
|
||||||
|
--- a/util/grub-mkconfig_lib.in
|
||||||
|
+++ b/util/grub-mkconfig_lib.in
|
||||||
|
@@ -52,7 +52,11 @@ grub_warn ()
|
||||||
|
|
||||||
|
make_system_path_relative_to_its_root ()
|
||||||
|
{
|
||||||
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] ; then
|
||||||
|
+ "${grub_mkrelpath}" -r "$1"
|
||||||
|
+ else
|
||||||
|
"${grub_mkrelpath}" "$1"
|
||||||
|
+ fi
|
||||||
|
}
|
||||||
|
|
||||||
|
is_path_readable_by_grub ()
|
||||||
|
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||||
|
index 858b526c925..de727e6ee6b 100644
|
||||||
|
--- a/util/grub.d/00_header.in
|
||||||
|
+++ b/util/grub.d/00_header.in
|
||||||
|
@@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
|
||||||
|
|
||||||
|
. "$pkgdatadir/grub-mkconfig_lib"
|
||||||
|
|
||||||
|
+if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
||||||
|
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
||||||
|
+ cat <<EOF
|
||||||
|
+set btrfs_relative_path="y"
|
||||||
|
+export btrfs_relative_path
|
||||||
|
+EOF
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
# Do this as early as possible, since other commands might depend on it.
|
||||||
|
# (e.g. the `loadfont' command might need lvm or raid modules)
|
||||||
|
for i in ${GRUB_PRELOAD_MODULES} ; do
|
||||||
|
@@ -45,7 +53,9 @@ if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT
|
||||||
|
cat << EOF
|
||||||
|
set pager=1
|
||||||
|
|
||||||
|
-if [ -s \$prefix/grubenv ]; then
|
||||||
|
+if [ -f \${config_directory}/grubenv ]; then
|
||||||
|
+ load_env -f \${config_directory}/grubenv
|
||||||
|
+elif [ -s \$prefix/grubenv ]; then
|
||||||
|
load_env
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
@@ -356,3 +366,16 @@ fi
|
||||||
|
if [ "x${GRUB_BADRAM}" != "x" ] ; then
|
||||||
|
echo "badram ${GRUB_BADRAM}"
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
+if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
||||||
|
+ [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ] &&
|
||||||
|
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
||||||
|
+ # Note: No $snapshot_num on *read-only* rollback! (bsc#901487)
|
||||||
|
+ cat <<EOF
|
||||||
|
+if [ -n "\$extra_cmdline" ]; then
|
||||||
|
+ submenu "Bootable snapshot #\$snapshot_num" {
|
||||||
|
+ menuentry "If OK, run 'snapper rollback' and reboot." { true; }
|
||||||
|
+ }
|
||||||
|
+fi
|
||||||
|
+EOF
|
||||||
|
+fi
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index 0f3c19e30cc..cbfaca34cc7 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -66,10 +66,14 @@ fi
|
||||||
|
|
||||||
|
case x"$GRUB_FS" in
|
||||||
|
xbtrfs)
|
||||||
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ]; then
|
||||||
|
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} \${extra_cmdline}"
|
||||||
|
+ else
|
||||||
|
rootsubvol="`make_system_path_relative_to_its_root /`"
|
||||||
|
rootsubvol="${rootsubvol#/}"
|
||||||
|
if [ "x${rootsubvol}" != x ]; then
|
||||||
|
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
||||||
|
+ fi
|
||||||
|
fi;;
|
||||||
|
xzfs)
|
||||||
|
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
||||||
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
||||||
|
index ada20775a14..e9e73b815fb 100644
|
||||||
|
--- a/util/grub.d/20_linux_xen.in
|
||||||
|
+++ b/util/grub.d/20_linux_xen.in
|
||||||
|
@@ -73,10 +73,14 @@ fi
|
||||||
|
|
||||||
|
case x"$GRUB_FS" in
|
||||||
|
xbtrfs)
|
||||||
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ]; then
|
||||||
|
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} \${extra_cmdline}"
|
||||||
|
+ else
|
||||||
|
rootsubvol="`make_system_path_relative_to_its_root /`"
|
||||||
|
rootsubvol="${rootsubvol#/}"
|
||||||
|
if [ "x${rootsubvol}" != x ]; then
|
||||||
|
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
||||||
|
+ fi
|
||||||
|
fi;;
|
||||||
|
xzfs)
|
||||||
|
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
||||||
@ -0,0 +1,537 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Tue, 9 Jul 2019 13:56:16 +0200
|
||||||
|
Subject: [PATCH] grub2-btrfs-06-subvol-mount
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 195 +++++++++++++++++++++++++++++++++++++++-
|
||||||
|
grub-core/osdep/linux/getroot.c | 148 +++++++++++++++++++++++++++++-
|
||||||
|
util/grub-install.c | 49 ++++++++++
|
||||||
|
include/grub/emu/getroot.h | 5 ++
|
||||||
|
4 files changed, 392 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index 113c1f746c9..d323746ecfa 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -41,6 +41,7 @@
|
||||||
|
#include <grub/command.h>
|
||||||
|
#include <grub/env.h>
|
||||||
|
#include <grub/extcmd.h>
|
||||||
|
+#include <grub/list.h>
|
||||||
|
#include <grub/crypto.h>
|
||||||
|
#include <grub/diskfilter.h>
|
||||||
|
#include <grub/safemath.h>
|
||||||
|
@@ -266,6 +267,12 @@ static grub_err_t
|
||||||
|
grub_btrfs_read_logical (struct grub_btrfs_data *data,
|
||||||
|
grub_disk_addr_t addr, void *buf, grub_size_t size,
|
||||||
|
int recursion_depth);
|
||||||
|
+static grub_err_t
|
||||||
|
+get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
|
||||||
|
+ grub_uint64_t *tree, grub_uint8_t *type);
|
||||||
|
+
|
||||||
|
+grub_uint64_t
|
||||||
|
+find_mtab_subvol_tree (const char *path, char **path_in_subvol);
|
||||||
|
|
||||||
|
static grub_err_t
|
||||||
|
read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
|
||||||
|
@@ -1223,9 +1230,26 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
|
||||||
|
grub_err_t err;
|
||||||
|
grub_uint64_t tree = 0;
|
||||||
|
grub_uint8_t type;
|
||||||
|
+ grub_uint64_t saved_tree;
|
||||||
|
struct grub_btrfs_key key;
|
||||||
|
|
||||||
|
+ if (path[0] == '\0')
|
||||||
|
+ {
|
||||||
|
+ data->fs_tree = 0;
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = get_root (data, &key, &tree, &type);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ saved_tree = data->fs_tree;
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+
|
||||||
|
err = find_path (data, path, &key, &tree, &type);
|
||||||
|
+
|
||||||
|
+ data->fs_tree = saved_tree;
|
||||||
|
+
|
||||||
|
if (err)
|
||||||
|
return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
|
||||||
|
|
||||||
|
@@ -2199,11 +2223,20 @@ grub_btrfs_dir (grub_device_t device, const char *path,
|
||||||
|
int r = 0;
|
||||||
|
grub_uint64_t tree;
|
||||||
|
grub_uint8_t type;
|
||||||
|
+ char *new_path = NULL;
|
||||||
|
|
||||||
|
if (!data)
|
||||||
|
return grub_errno;
|
||||||
|
|
||||||
|
- err = find_path (data, path, &key_in, &tree, &type);
|
||||||
|
+ tree = find_mtab_subvol_tree (path, &new_path);
|
||||||
|
+
|
||||||
|
+ if (tree)
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+
|
||||||
|
+ err = find_path (data, new_path ? new_path : path, &key_in, &tree, &type);
|
||||||
|
+ if (new_path)
|
||||||
|
+ grub_free (new_path);
|
||||||
|
+
|
||||||
|
if (err)
|
||||||
|
{
|
||||||
|
grub_btrfs_unmount (data);
|
||||||
|
@@ -2305,11 +2338,21 @@ grub_btrfs_open (struct grub_file *file, const char *name)
|
||||||
|
struct grub_btrfs_inode inode;
|
||||||
|
grub_uint8_t type;
|
||||||
|
struct grub_btrfs_key key_in;
|
||||||
|
+ grub_uint64_t tree;
|
||||||
|
+ char *new_path = NULL;
|
||||||
|
|
||||||
|
if (!data)
|
||||||
|
return grub_errno;
|
||||||
|
|
||||||
|
- err = find_path (data, name, &key_in, &data->tree, &type);
|
||||||
|
+ tree = find_mtab_subvol_tree (name, &new_path);
|
||||||
|
+
|
||||||
|
+ if (tree)
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+
|
||||||
|
+ err = find_path (data, new_path ? new_path : name, &key_in, &data->tree, &type);
|
||||||
|
+ if (new_path)
|
||||||
|
+ grub_free (new_path);
|
||||||
|
+
|
||||||
|
if (err)
|
||||||
|
{
|
||||||
|
grub_btrfs_unmount (data);
|
||||||
|
@@ -2480,6 +2523,150 @@ grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+struct grub_btrfs_mtab
|
||||||
|
+{
|
||||||
|
+ struct grub_btrfs_mtab *next;
|
||||||
|
+ struct grub_btrfs_mtab **prev;
|
||||||
|
+ char *path;
|
||||||
|
+ char *subvol;
|
||||||
|
+ grub_uint64_t tree;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+typedef struct grub_btrfs_mtab* grub_btrfs_mtab_t;
|
||||||
|
+
|
||||||
|
+static struct grub_btrfs_mtab *btrfs_mtab;
|
||||||
|
+
|
||||||
|
+#define FOR_GRUB_MTAB(var) FOR_LIST_ELEMENTS (var, btrfs_mtab)
|
||||||
|
+#define FOR_GRUB_MTAB_SAFE(var, next) FOR_LIST_ELEMENTS_SAFE((var), (next), btrfs_mtab)
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+add_mountpoint (const char *path, const char *subvol, grub_uint64_t tree)
|
||||||
|
+{
|
||||||
|
+ grub_btrfs_mtab_t m = grub_malloc (sizeof (*m));
|
||||||
|
+
|
||||||
|
+ m->path = grub_strdup (path);
|
||||||
|
+ m->subvol = grub_strdup (subvol);
|
||||||
|
+ m->tree = tree;
|
||||||
|
+ grub_list_push (GRUB_AS_LIST_P (&btrfs_mtab), GRUB_AS_LIST (m));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_cmd_btrfs_mount_subvol (grub_command_t cmd __attribute__ ((unused)), int argc,
|
||||||
|
+ char **argv)
|
||||||
|
+{
|
||||||
|
+ char *devname, *dirname, *subvol;
|
||||||
|
+ struct grub_btrfs_key key_in;
|
||||||
|
+ grub_uint8_t type;
|
||||||
|
+ grub_uint64_t tree;
|
||||||
|
+ grub_uint64_t saved_tree;
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ struct grub_btrfs_data *data = NULL;
|
||||||
|
+ grub_device_t dev = NULL;
|
||||||
|
+
|
||||||
|
+ if (argc < 3)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "required <dev> <dir> and <subvol>");
|
||||||
|
+
|
||||||
|
+ devname = grub_file_get_device_name(argv[0]);
|
||||||
|
+ dev = grub_device_open (devname);
|
||||||
|
+ grub_free (devname);
|
||||||
|
+
|
||||||
|
+ if (!dev)
|
||||||
|
+ {
|
||||||
|
+ err = grub_errno;
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ dirname = argv[1];
|
||||||
|
+ subvol = argv[2];
|
||||||
|
+
|
||||||
|
+ data = grub_btrfs_mount (dev);
|
||||||
|
+ if (!data)
|
||||||
|
+ {
|
||||||
|
+ err = grub_errno;
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = find_path (data, dirname, &key_in, &tree, &type);
|
||||||
|
+ if (err)
|
||||||
|
+ goto err_out;
|
||||||
|
+
|
||||||
|
+ if (type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
|
||||||
|
+ {
|
||||||
|
+ err = grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory"));
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = get_root (data, &key_in, &tree, &type);
|
||||||
|
+
|
||||||
|
+ if (err)
|
||||||
|
+ goto err_out;
|
||||||
|
+
|
||||||
|
+ saved_tree = data->fs_tree;
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+ err = find_path (data, subvol, &key_in, &tree, &type);
|
||||||
|
+ data->fs_tree = saved_tree;
|
||||||
|
+
|
||||||
|
+ if (err)
|
||||||
|
+ goto err_out;
|
||||||
|
+
|
||||||
|
+ if (key_in.object_id != grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK) || tree == 0)
|
||||||
|
+ {
|
||||||
|
+ err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "%s: not a subvolume\n", subvol);
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_btrfs_unmount (data);
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+ add_mountpoint (dirname, subvol, tree);
|
||||||
|
+
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+
|
||||||
|
+err_out:
|
||||||
|
+
|
||||||
|
+ if (data)
|
||||||
|
+ grub_btrfs_unmount (data);
|
||||||
|
+
|
||||||
|
+ if (dev)
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+grub_uint64_t
|
||||||
|
+find_mtab_subvol_tree (const char *path, char **path_in_subvol)
|
||||||
|
+{
|
||||||
|
+ grub_btrfs_mtab_t m, cm;
|
||||||
|
+ grub_uint64_t tree;
|
||||||
|
+
|
||||||
|
+ if (!path || !path_in_subvol)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ *path_in_subvol = NULL;
|
||||||
|
+ tree = 0;
|
||||||
|
+ cm = NULL;
|
||||||
|
+
|
||||||
|
+ FOR_GRUB_MTAB (m)
|
||||||
|
+ {
|
||||||
|
+ if (grub_strncmp (path, m->path, grub_strlen (m->path)) == 0)
|
||||||
|
+ {
|
||||||
|
+ if (!cm)
|
||||||
|
+ cm = m;
|
||||||
|
+ else
|
||||||
|
+ if (grub_strcmp (m->path, cm->path) > 0)
|
||||||
|
+ cm = m;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (cm)
|
||||||
|
+ {
|
||||||
|
+ const char *s = path + grub_strlen (cm->path);
|
||||||
|
+ *path_in_subvol = (s[0] == '\0') ? grub_strdup ("/") : grub_strdup (s);
|
||||||
|
+ tree = cm->tree;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return tree;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static grub_err_t
|
||||||
|
get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree,
|
||||||
|
grub_uint64_t objectid, grub_uint64_t offset,
|
||||||
|
@@ -2686,6 +2873,7 @@ static struct grub_fs grub_btrfs_fs = {
|
||||||
|
};
|
||||||
|
|
||||||
|
static grub_command_t cmd_info;
|
||||||
|
+static grub_command_t cmd_mount_subvol;
|
||||||
|
static grub_extcmd_t cmd_list_subvols;
|
||||||
|
|
||||||
|
static char *
|
||||||
|
@@ -2749,6 +2937,9 @@ GRUB_MOD_INIT (btrfs)
|
||||||
|
cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
|
||||||
|
"DEVICE",
|
||||||
|
"Print BtrFS info about DEVICE.");
|
||||||
|
+ cmd_mount_subvol = grub_register_command("btrfs-mount-subvol", grub_cmd_btrfs_mount_subvol,
|
||||||
|
+ "DEVICE DIRECTORY SUBVOL",
|
||||||
|
+ "Set btrfs DEVICE the DIRECTORY a mountpoint of SUBVOL.");
|
||||||
|
cmd_list_subvols = grub_register_extcmd("btrfs-list-subvols",
|
||||||
|
grub_cmd_btrfs_list_subvols, 0,
|
||||||
|
"[-p|-n] [-o var] DEVICE",
|
||||||
|
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
|
||||||
|
index caf9b1ccd3f..28790307e00 100644
|
||||||
|
--- a/grub-core/osdep/linux/getroot.c
|
||||||
|
+++ b/grub-core/osdep/linux/getroot.c
|
||||||
|
@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
|
||||||
|
grub_uint32_t unused[9];
|
||||||
|
};
|
||||||
|
|
||||||
|
+struct btrfs_ioctl_search_header {
|
||||||
|
+ grub_uint64_t transid;
|
||||||
|
+ grub_uint64_t objectid;
|
||||||
|
+ grub_uint64_t offset;
|
||||||
|
+ grub_uint32_t type;
|
||||||
|
+ grub_uint32_t len;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
struct btrfs_ioctl_search_args {
|
||||||
|
struct btrfs_ioctl_search_key key;
|
||||||
|
grub_uint64_t buf[(4096 - sizeof(struct btrfs_ioctl_search_key))
|
||||||
|
@@ -378,6 +386,109 @@ get_btrfs_fs_prefix (const char *mount_path)
|
||||||
|
|
||||||
|
int use_relative_path_on_btrfs = 0;
|
||||||
|
|
||||||
|
+static char *
|
||||||
|
+get_btrfs_subvol (const char *path)
|
||||||
|
+{
|
||||||
|
+ struct btrfs_ioctl_ino_lookup_args args;
|
||||||
|
+ grub_uint64_t tree_id;
|
||||||
|
+ int fd = -1;
|
||||||
|
+ char *ret = NULL;
|
||||||
|
+
|
||||||
|
+ fd = open (path, O_RDONLY);
|
||||||
|
+
|
||||||
|
+ if (fd < 0)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
+ memset (&args, 0, sizeof(args));
|
||||||
|
+ args.objectid = GRUB_BTRFS_TREE_ROOT_OBJECTID;
|
||||||
|
+
|
||||||
|
+ if (ioctl (fd, BTRFS_IOC_INO_LOOKUP, &args) < 0)
|
||||||
|
+ goto error;
|
||||||
|
+
|
||||||
|
+ tree_id = args.treeid;
|
||||||
|
+
|
||||||
|
+ while (tree_id != GRUB_BTRFS_ROOT_VOL_OBJECTID)
|
||||||
|
+ {
|
||||||
|
+ struct btrfs_ioctl_search_args sargs;
|
||||||
|
+ struct grub_btrfs_root_backref *br;
|
||||||
|
+ struct btrfs_ioctl_search_header *search_header;
|
||||||
|
+ char *old;
|
||||||
|
+ grub_uint16_t len;
|
||||||
|
+ grub_uint64_t inode_id;
|
||||||
|
+
|
||||||
|
+ memset (&sargs, 0, sizeof(sargs));
|
||||||
|
+
|
||||||
|
+ sargs.key.tree_id = 1;
|
||||||
|
+ sargs.key.min_objectid = tree_id;
|
||||||
|
+ sargs.key.max_objectid = tree_id;
|
||||||
|
+
|
||||||
|
+ sargs.key.min_offset = 0;
|
||||||
|
+ sargs.key.max_offset = ~0ULL;
|
||||||
|
+ sargs.key.min_transid = 0;
|
||||||
|
+ sargs.key.max_transid = ~0ULL;
|
||||||
|
+ sargs.key.min_type = GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF;
|
||||||
|
+ sargs.key.max_type = GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF;
|
||||||
|
+
|
||||||
|
+ sargs.key.nr_items = 1;
|
||||||
|
+
|
||||||
|
+ if (ioctl (fd, BTRFS_IOC_TREE_SEARCH, &sargs) < 0)
|
||||||
|
+ goto error;
|
||||||
|
+
|
||||||
|
+ if (sargs.key.nr_items == 0)
|
||||||
|
+ goto error;
|
||||||
|
+
|
||||||
|
+ search_header = (struct btrfs_ioctl_search_header *)sargs.buf;
|
||||||
|
+ br = (struct grub_btrfs_root_backref *) (search_header + 1);
|
||||||
|
+
|
||||||
|
+ len = grub_le_to_cpu16 (br->n);
|
||||||
|
+ inode_id = grub_le_to_cpu64 (br->inode_id);
|
||||||
|
+ tree_id = search_header->offset;
|
||||||
|
+
|
||||||
|
+ old = ret;
|
||||||
|
+ ret = malloc (len + 1);
|
||||||
|
+ memcpy (ret, br->name, len);
|
||||||
|
+ ret[len] = '\0';
|
||||||
|
+
|
||||||
|
+ if (inode_id != GRUB_BTRFS_TREE_ROOT_OBJECTID)
|
||||||
|
+ {
|
||||||
|
+ char *s;
|
||||||
|
+
|
||||||
|
+ memset(&args, 0, sizeof(args));
|
||||||
|
+ args.treeid = search_header->offset;
|
||||||
|
+ args.objectid = inode_id;
|
||||||
|
+
|
||||||
|
+ if (ioctl (fd, BTRFS_IOC_INO_LOOKUP, &args) < 0)
|
||||||
|
+ goto error;
|
||||||
|
+
|
||||||
|
+ s = xasprintf ("%s%s", args.name, ret);
|
||||||
|
+ free (ret);
|
||||||
|
+ ret = s;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (old)
|
||||||
|
+ {
|
||||||
|
+ char *s = xasprintf ("%s/%s", ret, old);
|
||||||
|
+ free (ret);
|
||||||
|
+ free (old);
|
||||||
|
+ ret = s;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ close (fd);
|
||||||
|
+ return ret;
|
||||||
|
+
|
||||||
|
+error:
|
||||||
|
+
|
||||||
|
+ if (fd >= 0)
|
||||||
|
+ close (fd);
|
||||||
|
+ if (ret)
|
||||||
|
+ free (ret);
|
||||||
|
+
|
||||||
|
+ return NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void (*grub_find_root_btrfs_mount_path_hook)(const char *mount_path);
|
||||||
|
+
|
||||||
|
char **
|
||||||
|
grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
|
||||||
|
{
|
||||||
|
@@ -519,12 +630,15 @@ again:
|
||||||
|
else if (grub_strcmp (entries[i].fstype, "btrfs") == 0)
|
||||||
|
{
|
||||||
|
ret = grub_find_root_devices_from_btrfs (dir);
|
||||||
|
- fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path);
|
||||||
|
if (use_relative_path_on_btrfs)
|
||||||
|
{
|
||||||
|
- if (fs_prefix)
|
||||||
|
- free (fs_prefix);
|
||||||
|
fs_prefix = xstrdup ("/");
|
||||||
|
+ if (grub_find_root_btrfs_mount_path_hook)
|
||||||
|
+ grub_find_root_btrfs_mount_path_hook (entries[i].enc_path);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
|
||||||
|
@@ -1150,6 +1264,34 @@ grub_util_get_grub_dev_os (const char *os_dev)
|
||||||
|
return grub_dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+char *
|
||||||
|
+grub_util_get_btrfs_subvol (const char *path, char **mount_path)
|
||||||
|
+{
|
||||||
|
+ char *mp = NULL;
|
||||||
|
+
|
||||||
|
+ if (mount_path)
|
||||||
|
+ *mount_path = NULL;
|
||||||
|
+
|
||||||
|
+ auto void
|
||||||
|
+ mount_path_hook (const char *m)
|
||||||
|
+ {
|
||||||
|
+ mp = strdup (m);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_find_root_btrfs_mount_path_hook = mount_path_hook;
|
||||||
|
+ grub_free (grub_find_root_devices_from_mountinfo (path, NULL));
|
||||||
|
+ grub_find_root_btrfs_mount_path_hook = NULL;
|
||||||
|
+
|
||||||
|
+ if (!mp)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
+ if (mount_path)
|
||||||
|
+ *mount_path = mp;
|
||||||
|
+
|
||||||
|
+ return get_btrfs_subvol (mp);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
char *
|
||||||
|
grub_make_system_path_relative_to_its_root_os (const char *path)
|
||||||
|
{
|
||||||
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
||||||
|
index 0f66f36d23a..84ed6e88ecb 100644
|
||||||
|
--- a/util/grub-install.c
|
||||||
|
+++ b/util/grub-install.c
|
||||||
|
@@ -1569,6 +1569,55 @@ main (int argc, char *argv[])
|
||||||
|
prefix_drive = xasprintf ("(%s)", grub_drives[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef __linux__
|
||||||
|
+
|
||||||
|
+ if (config.is_suse_btrfs_snapshot_enabled
|
||||||
|
+ && grub_strncmp(grub_fs->name, "btrfs", sizeof ("btrfs") - 1) == 0)
|
||||||
|
+ {
|
||||||
|
+ char *subvol = NULL;
|
||||||
|
+ char *mount_path = NULL;
|
||||||
|
+ char **rootdir_devices = NULL;
|
||||||
|
+ char *rootdir_path = grub_util_path_concat (2, "/", rootdir);
|
||||||
|
+
|
||||||
|
+ if (grub_util_is_directory (rootdir_path))
|
||||||
|
+ rootdir_devices = grub_guess_root_devices (rootdir_path);
|
||||||
|
+
|
||||||
|
+ free (rootdir_path);
|
||||||
|
+
|
||||||
|
+ if (rootdir_devices && rootdir_devices[0])
|
||||||
|
+ if (grub_strcmp (rootdir_devices[0], grub_devices[0]) == 0)
|
||||||
|
+ subvol = grub_util_get_btrfs_subvol (platdir, &mount_path);
|
||||||
|
+
|
||||||
|
+ if (subvol && mount_path)
|
||||||
|
+ {
|
||||||
|
+ char *def_subvol;
|
||||||
|
+
|
||||||
|
+ def_subvol = grub_util_get_btrfs_subvol ("/", NULL);
|
||||||
|
+
|
||||||
|
+ if (def_subvol)
|
||||||
|
+ {
|
||||||
|
+ if (!load_cfg_f)
|
||||||
|
+ load_cfg_f = grub_util_fopen (load_cfg, "wb");
|
||||||
|
+ have_load_cfg = 1;
|
||||||
|
+
|
||||||
|
+ if (grub_strcmp (subvol, def_subvol) != 0)
|
||||||
|
+ fprintf (load_cfg_f, "btrfs-mount-subvol ($root) %s %s\n", mount_path, subvol);
|
||||||
|
+ free (def_subvol);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (curdev = rootdir_devices; *curdev; curdev++)
|
||||||
|
+ free (*curdev);
|
||||||
|
+ if (rootdir_devices)
|
||||||
|
+ free (rootdir_devices);
|
||||||
|
+ if (subvol)
|
||||||
|
+ free (subvol);
|
||||||
|
+ if (mount_path)
|
||||||
|
+ free (mount_path);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
char mkimage_target[200];
|
||||||
|
const char *core_name = NULL;
|
||||||
|
|
||||||
|
diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
|
||||||
|
index 73fa2d34abb..9c642ae3fe3 100644
|
||||||
|
--- a/include/grub/emu/getroot.h
|
||||||
|
+++ b/include/grub/emu/getroot.h
|
||||||
|
@@ -53,6 +53,11 @@ char **
|
||||||
|
grub_find_root_devices_from_mountinfo (const char *dir, char **relroot);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef __linux__
|
||||||
|
+char *
|
||||||
|
+grub_util_get_btrfs_subvol (const char *path, char **mount_path);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/* Devmapper functions provided by getroot_devmapper.c. */
|
||||||
|
void
|
||||||
|
grub_util_pull_devmapper (const char *os_dev);
|
||||||
@ -0,0 +1,58 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
||||||
|
Date: Tue, 21 Jun 2016 16:44:17 +0000
|
||||||
|
Subject: [PATCH] Fallback to old subvol name scheme to support old snapshot
|
||||||
|
config
|
||||||
|
|
||||||
|
Ref: bsc#953538
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 32 +++++++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 31 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index d323746ecfa..673ded03522 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
|
||||||
|
return GRUB_ERR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static grub_err_t
|
||||||
|
+lookup_root_by_name_fallback(struct grub_btrfs_data *data, const char *path)
|
||||||
|
+{
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ grub_uint64_t tree = 0;
|
||||||
|
+ grub_uint8_t type;
|
||||||
|
+ struct grub_btrfs_key key;
|
||||||
|
+
|
||||||
|
+ err = find_path (data, path, &key, &tree, &type);
|
||||||
|
+ if (err)
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
|
||||||
|
+
|
||||||
|
+ if (key.object_id != grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK) || tree == 0)
|
||||||
|
+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, "%s: not a subvolume\n", path);
|
||||||
|
+
|
||||||
|
+ data->fs_tree = tree;
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static grub_err_t
|
||||||
|
btrfs_handle_subvol(struct grub_btrfs_data *data __attribute__ ((unused)))
|
||||||
|
{
|
||||||
|
if (btrfs_default_subvol)
|
||||||
|
- return lookup_root_by_name(data, btrfs_default_subvol);
|
||||||
|
+ {
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ err = lookup_root_by_name(data, btrfs_default_subvol);
|
||||||
|
+
|
||||||
|
+ /* Fallback to old schemes */
|
||||||
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
||||||
|
+ {
|
||||||
|
+ err = GRUB_ERR_NONE;
|
||||||
|
+ return lookup_root_by_name_fallback(data, btrfs_default_subvol);
|
||||||
|
+ }
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (btrfs_default_subvolid)
|
||||||
|
return lookup_root_by_id(data, btrfs_default_subvolid);
|
||||||
@ -0,0 +1,272 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Thu, 11 May 2017 08:56:57 +0000
|
||||||
|
Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 238 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index 673ded03522..2b21cbaa67e 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -2887,6 +2887,238 @@ out:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_btrfs_get_parent_subvol_path (struct grub_btrfs_data *data,
|
||||||
|
+ grub_uint64_t child_id,
|
||||||
|
+ const char *child_path,
|
||||||
|
+ grub_uint64_t *parent_id,
|
||||||
|
+ char **path_out)
|
||||||
|
+{
|
||||||
|
+ grub_uint64_t fs_root = 0;
|
||||||
|
+ struct grub_btrfs_key key_in = {
|
||||||
|
+ .object_id = child_id,
|
||||||
|
+ .type = GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF,
|
||||||
|
+ .offset = 0,
|
||||||
|
+ }, key_out;
|
||||||
|
+ struct grub_btrfs_root_ref *ref;
|
||||||
|
+ char *buf;
|
||||||
|
+ struct grub_btrfs_leaf_descriptor desc;
|
||||||
|
+ grub_size_t elemsize;
|
||||||
|
+ grub_disk_addr_t elemaddr;
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ char *parent_path;
|
||||||
|
+
|
||||||
|
+ *parent_id = 0;
|
||||||
|
+ *path_out = 0;
|
||||||
|
+
|
||||||
|
+ err = lower_bound(data, &key_in, &key_out, data->sblock.root_tree,
|
||||||
|
+ &elemaddr, &elemsize, &desc, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF || elemaddr == 0)
|
||||||
|
+ next(data, &desc, &elemaddr, &elemsize, &key_out);
|
||||||
|
+
|
||||||
|
+ if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF)
|
||||||
|
+ {
|
||||||
|
+ free_iterator(&desc);
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("can't find root backrefs"));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ buf = grub_malloc(elemsize + 1);
|
||||||
|
+ if (!buf)
|
||||||
|
+ {
|
||||||
|
+ free_iterator(&desc);
|
||||||
|
+ return grub_errno;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = grub_btrfs_read_logical(data, elemaddr, buf, elemsize, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free(buf);
|
||||||
|
+ free_iterator(&desc);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ buf[elemsize] = 0;
|
||||||
|
+ ref = (struct grub_btrfs_root_ref *)buf;
|
||||||
|
+
|
||||||
|
+ err = get_fs_root(data, data->sblock.root_tree, grub_le_to_cpu64 (key_out.offset),
|
||||||
|
+ 0, &fs_root);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free(buf);
|
||||||
|
+ free_iterator(&desc);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ find_pathname(data, grub_le_to_cpu64 (ref->dirid), fs_root, ref->name, &parent_path);
|
||||||
|
+
|
||||||
|
+ if (child_path)
|
||||||
|
+ {
|
||||||
|
+ *path_out = grub_xasprintf ("%s/%s", parent_path, child_path);
|
||||||
|
+ grub_free (parent_path);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ *path_out = parent_path;
|
||||||
|
+
|
||||||
|
+ *parent_id = grub_le_to_cpu64 (key_out.offset);
|
||||||
|
+
|
||||||
|
+ grub_free(buf);
|
||||||
|
+ free_iterator(&desc);
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_btrfs_get_default_subvolume_id (struct grub_btrfs_data *data, grub_uint64_t *id)
|
||||||
|
+{
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ grub_disk_addr_t elemaddr;
|
||||||
|
+ grub_size_t elemsize;
|
||||||
|
+ struct grub_btrfs_key key, key_out;
|
||||||
|
+ struct grub_btrfs_dir_item *direl = NULL;
|
||||||
|
+ const char *ctoken = "default";
|
||||||
|
+ grub_size_t ctokenlen = sizeof ("default") - 1;
|
||||||
|
+
|
||||||
|
+ *id = 0;
|
||||||
|
+ key.object_id = data->sblock.root_dir_objectid;
|
||||||
|
+ key.type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
||||||
|
+ key.offset = grub_cpu_to_le64 (~grub_getcrc32c (1, ctoken, ctokenlen));
|
||||||
|
+ err = lower_bound (data, &key, &key_out, data->sblock.root_tree, &elemaddr, &elemsize,
|
||||||
|
+ NULL, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
+ if (key_cmp (&key, &key_out) != 0)
|
||||||
|
+ return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file not found"));
|
||||||
|
+
|
||||||
|
+ struct grub_btrfs_dir_item *cdirel;
|
||||||
|
+ direl = grub_malloc (elemsize + 1);
|
||||||
|
+ err = grub_btrfs_read_logical (data, elemaddr, direl, elemsize, 0);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (direl);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+ for (cdirel = direl;
|
||||||
|
+ (grub_uint8_t *) cdirel - (grub_uint8_t *) direl
|
||||||
|
+ < (grub_ssize_t) elemsize;
|
||||||
|
+ cdirel = (void *) ((grub_uint8_t *) (direl + 1)
|
||||||
|
+ + grub_le_to_cpu16 (cdirel->n)
|
||||||
|
+ + grub_le_to_cpu16 (cdirel->m)))
|
||||||
|
+ {
|
||||||
|
+ if (ctokenlen == grub_le_to_cpu16 (cdirel->n)
|
||||||
|
+ && grub_memcmp (cdirel->name, ctoken, ctokenlen) == 0)
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ if ((grub_uint8_t *) cdirel - (grub_uint8_t *) direl
|
||||||
|
+ >= (grub_ssize_t) elemsize)
|
||||||
|
+ {
|
||||||
|
+ grub_free (direl);
|
||||||
|
+ err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file not found"));
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (cdirel->key.type != GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM)
|
||||||
|
+ {
|
||||||
|
+ grub_free (direl);
|
||||||
|
+ err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file not found"));
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ *id = grub_le_to_cpu64 (cdirel->key.object_id);
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_cmd_btrfs_get_default_subvol (struct grub_extcmd_context *ctxt,
|
||||||
|
+ int argc, char **argv)
|
||||||
|
+{
|
||||||
|
+ char *devname;
|
||||||
|
+ grub_device_t dev;
|
||||||
|
+ struct grub_btrfs_data *data;
|
||||||
|
+ grub_err_t err;
|
||||||
|
+ grub_uint64_t id;
|
||||||
|
+ char *subvol = NULL;
|
||||||
|
+ grub_uint64_t subvolid = 0;
|
||||||
|
+ char *varname = NULL;
|
||||||
|
+ char *output = NULL;
|
||||||
|
+ int path_only = ctxt->state[1].set;
|
||||||
|
+ int num_only = ctxt->state[2].set;
|
||||||
|
+
|
||||||
|
+ if (ctxt->state[0].set)
|
||||||
|
+ varname = ctxt->state[0].arg;
|
||||||
|
+
|
||||||
|
+ if (argc < 1)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
|
||||||
|
+
|
||||||
|
+ devname = grub_file_get_device_name(argv[0]);
|
||||||
|
+ if (!devname)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ dev = grub_device_open (devname);
|
||||||
|
+ grub_free (devname);
|
||||||
|
+ if (!dev)
|
||||||
|
+ return grub_errno;
|
||||||
|
+
|
||||||
|
+ data = grub_btrfs_mount(dev);
|
||||||
|
+ if (!data)
|
||||||
|
+ {
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+ grub_dprintf ("btrfs", "failed to open fs\n");
|
||||||
|
+ grub_errno = GRUB_ERR_NONE;
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ err = grub_btrfs_get_default_subvolume_id (data, &subvolid);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_btrfs_unmount (data);
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ id = subvolid;
|
||||||
|
+ while (id != GRUB_BTRFS_ROOT_VOL_OBJECTID)
|
||||||
|
+ {
|
||||||
|
+ grub_uint64_t parent_id;
|
||||||
|
+ char *path_out;
|
||||||
|
+
|
||||||
|
+ err = grub_btrfs_get_parent_subvol_path (data, grub_cpu_to_le64 (id), subvol, &parent_id, &path_out);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_btrfs_unmount (data);
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+ return err;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (subvol)
|
||||||
|
+ grub_free (subvol);
|
||||||
|
+ subvol = path_out;
|
||||||
|
+ id = parent_id;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (num_only && path_only)
|
||||||
|
+ output = grub_xasprintf ("%"PRIuGRUB_UINT64_T" /%s", subvolid, subvol);
|
||||||
|
+ else if (num_only)
|
||||||
|
+ output = grub_xasprintf ("%"PRIuGRUB_UINT64_T, subvolid);
|
||||||
|
+ else
|
||||||
|
+ output = grub_xasprintf ("/%s", subvol);
|
||||||
|
+
|
||||||
|
+ if (varname)
|
||||||
|
+ grub_env_set(varname, output);
|
||||||
|
+ else
|
||||||
|
+ grub_printf ("%s\n", output);
|
||||||
|
+
|
||||||
|
+ grub_free (output);
|
||||||
|
+ grub_free (subvol);
|
||||||
|
+
|
||||||
|
+ grub_btrfs_unmount (data);
|
||||||
|
+ grub_device_close (dev);
|
||||||
|
+
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static struct grub_fs grub_btrfs_fs = {
|
||||||
|
.name = "btrfs",
|
||||||
|
.fs_dir = grub_btrfs_dir,
|
||||||
|
@@ -2905,6 +3137,7 @@ static struct grub_fs grub_btrfs_fs = {
|
||||||
|
static grub_command_t cmd_info;
|
||||||
|
static grub_command_t cmd_mount_subvol;
|
||||||
|
static grub_extcmd_t cmd_list_subvols;
|
||||||
|
+static grub_extcmd_t cmd_get_default_subvol;
|
||||||
|
|
||||||
|
static char *
|
||||||
|
subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
|
||||||
|
@@ -2975,6 +3208,11 @@ GRUB_MOD_INIT (btrfs)
|
||||||
|
"[-p|-n] [-o var] DEVICE",
|
||||||
|
"Print list of BtrFS subvolumes on "
|
||||||
|
"DEVICE.", options);
|
||||||
|
+ cmd_get_default_subvol = grub_register_extcmd("btrfs-get-default-subvol",
|
||||||
|
+ grub_cmd_btrfs_get_default_subvol, 0,
|
||||||
|
+ "[-p|-n] [-o var] DEVICE",
|
||||||
|
+ "Print default BtrFS subvolume on "
|
||||||
|
+ "DEVICE.", options);
|
||||||
|
grub_register_variable_hook ("btrfs_subvol", subvol_get_env,
|
||||||
|
subvol_set_env);
|
||||||
|
grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 1 Jun 2017 09:59:56 -0400
|
||||||
|
Subject: [PATCH] Add grub_efi_allocate_pool() and grub_efi_free_pool()
|
||||||
|
wrappers.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
include/grub/efi/efi.h | 36 ++++++++++++++++++++++++++++++++----
|
||||||
|
1 file changed, 32 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
||||||
|
index 585fa6662b6..03f9a9d0118 100644
|
||||||
|
--- a/include/grub/efi/efi.h
|
||||||
|
+++ b/include/grub/efi/efi.h
|
||||||
|
@@ -24,6 +24,10 @@
|
||||||
|
#include <grub/dl.h>
|
||||||
|
#include <grub/efi/api.h>
|
||||||
|
|
||||||
|
+/* Variables. */
|
||||||
|
+extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
|
||||||
|
+extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
|
||||||
|
+
|
||||||
|
/* Functions. */
|
||||||
|
void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_efi_guid_t *protocol,
|
||||||
|
void *registration);
|
||||||
|
@@ -60,6 +64,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
|
||||||
|
grub_efi_uintn_t *descriptor_size,
|
||||||
|
grub_efi_uint32_t *descriptor_version);
|
||||||
|
void grub_efi_memory_fini (void);
|
||||||
|
+
|
||||||
|
+static inline grub_efi_status_t
|
||||||
|
+__attribute__((__unused__))
|
||||||
|
+grub_efi_allocate_pool (grub_efi_memory_type_t pool_type,
|
||||||
|
+ grub_efi_uintn_t buffer_size,
|
||||||
|
+ void **buffer)
|
||||||
|
+{
|
||||||
|
+ grub_efi_boot_services_t *b;
|
||||||
|
+ grub_efi_status_t status;
|
||||||
|
+
|
||||||
|
+ b = grub_efi_system_table->boot_services;
|
||||||
|
+ status = efi_call_3 (b->allocate_pool, pool_type, buffer_size, buffer);
|
||||||
|
+ return status;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static inline grub_efi_status_t
|
||||||
|
+__attribute__((__unused__))
|
||||||
|
+grub_efi_free_pool (void *buffer)
|
||||||
|
+{
|
||||||
|
+ grub_efi_boot_services_t *b;
|
||||||
|
+ grub_efi_status_t status;
|
||||||
|
+
|
||||||
|
+ b = grub_efi_system_table->boot_services;
|
||||||
|
+ status = efi_call_1 (b->free_pool, buffer);
|
||||||
|
+ return status;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
grub_efi_loaded_image_t *EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);
|
||||||
|
void EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t *dp);
|
||||||
|
char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
|
||||||
|
@@ -115,10 +146,7 @@ void grub_efi_init (void);
|
||||||
|
void grub_efi_fini (void);
|
||||||
|
void grub_efi_set_prefix (void);
|
||||||
|
|
||||||
|
-/* Variables. */
|
||||||
|
-extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
|
||||||
|
-extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
|
||||||
|
-
|
||||||
|
+/* More variables. */
|
||||||
|
extern int EXPORT_VAR(grub_efi_is_finished);
|
||||||
|
|
||||||
|
struct grub_net_card;
|
||||||
@ -0,0 +1,106 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 1 Jun 2017 10:06:38 -0400
|
||||||
|
Subject: [PATCH] Use grub_efi_...() memory helpers where reasonable.
|
||||||
|
|
||||||
|
This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and
|
||||||
|
grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
|
||||||
|
get more reasonable type checking.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/loader/efi/chainloader.c | 24 +++++++++---------------
|
||||||
|
1 file changed, 9 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
||||||
|
index 3ff305b1d32..ba3d2930197 100644
|
||||||
|
--- a/grub-core/loader/efi/chainloader.c
|
||||||
|
+++ b/grub-core/loader/efi/chainloader.c
|
||||||
|
@@ -65,7 +65,7 @@ grub_chainloader_unload (void)
|
||||||
|
|
||||||
|
b = grub_efi_system_table->boot_services;
|
||||||
|
efi_call_1 (b->unload_image, image_handle);
|
||||||
|
- efi_call_2 (b->free_pages, address, pages);
|
||||||
|
+ grub_efi_free_pages (address, pages);
|
||||||
|
|
||||||
|
grub_free (file_path);
|
||||||
|
grub_free (cmdline);
|
||||||
|
@@ -108,7 +108,7 @@ grub_chainloader_boot (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exit_data)
|
||||||
|
- efi_call_1 (b->free_pool, exit_data);
|
||||||
|
+ grub_efi_free_pool (exit_data);
|
||||||
|
|
||||||
|
grub_loader_unset ();
|
||||||
|
|
||||||
|
@@ -523,10 +523,9 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
|
||||||
|
static grub_efi_boolean_t
|
||||||
|
handle_image (void *data, grub_efi_uint32_t datasize)
|
||||||
|
{
|
||||||
|
- grub_efi_boot_services_t *b;
|
||||||
|
grub_efi_loaded_image_t *li, li_bak;
|
||||||
|
grub_efi_status_t efi_status;
|
||||||
|
- char *buffer = NULL;
|
||||||
|
+ void *buffer = NULL;
|
||||||
|
char *buffer_aligned = NULL;
|
||||||
|
grub_efi_uint32_t i;
|
||||||
|
struct grub_pe32_section_table *section;
|
||||||
|
@@ -537,8 +536,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
|
||||||
|
int found_entry_point = 0;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
- b = grub_efi_system_table->boot_services;
|
||||||
|
-
|
||||||
|
rc = read_header (data, datasize, &context);
|
||||||
|
if (rc < 0)
|
||||||
|
{
|
||||||
|
@@ -578,8 +575,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
|
||||||
|
grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
|
||||||
|
context.image_size, datasize);
|
||||||
|
|
||||||
|
- efi_status = efi_call_3 (b->allocate_pool, GRUB_EFI_LOADER_DATA,
|
||||||
|
- buffer_size, &buffer);
|
||||||
|
+ efi_status = grub_efi_allocate_pool (GRUB_EFI_LOADER_DATA, buffer_size,
|
||||||
|
+ &buffer);
|
||||||
|
|
||||||
|
if (efi_status != GRUB_EFI_SUCCESS)
|
||||||
|
{
|
||||||
|
@@ -811,14 +808,14 @@ handle_image (void *data, grub_efi_uint32_t datasize)
|
||||||
|
|
||||||
|
grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
|
||||||
|
grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
|
||||||
|
- efi_status = efi_call_1 (b->free_pool, buffer);
|
||||||
|
+ efi_status = grub_efi_free_pool (buffer);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
error_exit:
|
||||||
|
grub_dprintf ("chain", "error_exit: grub_errno: %d\n", grub_errno);
|
||||||
|
if (buffer)
|
||||||
|
- efi_call_1 (b->free_pool, buffer);
|
||||||
|
+ grub_efi_free_pool (buffer);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -826,10 +823,7 @@ error_exit:
|
||||||
|
static grub_err_t
|
||||||
|
grub_secureboot_chainloader_unload (void)
|
||||||
|
{
|
||||||
|
- grub_efi_boot_services_t *b;
|
||||||
|
-
|
||||||
|
- b = grub_efi_system_table->boot_services;
|
||||||
|
- efi_call_2 (b->free_pages, address, pages);
|
||||||
|
+ grub_efi_free_pages (address, pages);
|
||||||
|
grub_free (file_path);
|
||||||
|
grub_free (cmdline);
|
||||||
|
cmdline = 0;
|
||||||
|
@@ -1096,7 +1090,7 @@ fail:
|
||||||
|
grub_free (file_path);
|
||||||
|
|
||||||
|
if (address)
|
||||||
|
- efi_call_2 (b->free_pages, address, pages);
|
||||||
|
+ grub_efi_free_pages (address, pages);
|
||||||
|
|
||||||
|
if (cmdline)
|
||||||
|
grub_free (cmdline);
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 1 Jun 2017 10:07:50 -0400
|
||||||
|
Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
|
||||||
|
|
||||||
|
This avoids syntax checkers getting confused about if it's llx or lx.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/loader/efi/chainloader.c | 3 ++-
|
||||||
|
include/grub/efi/api.h | 9 +++++++++
|
||||||
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
||||||
|
index ba3d2930197..47f5aa14817 100644
|
||||||
|
--- a/grub-core/loader/efi/chainloader.c
|
||||||
|
+++ b/grub-core/loader/efi/chainloader.c
|
||||||
|
@@ -806,7 +806,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
|
||||||
|
efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
|
||||||
|
grub_efi_system_table);
|
||||||
|
|
||||||
|
- grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
|
||||||
|
+ grub_dprintf ("chain", "entry_point returned 0x%"PRIxGRUB_EFI_STATUS"\n",
|
||||||
|
+ efi_status);
|
||||||
|
grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
|
||||||
|
efi_status = grub_efi_free_pool (buffer);
|
||||||
|
|
||||||
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
||||||
|
index 117469450d3..99628801478 100644
|
||||||
|
--- a/include/grub/efi/api.h
|
||||||
|
+++ b/include/grub/efi/api.h
|
||||||
|
@@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t;
|
||||||
|
typedef grub_uint8_t grub_efi_char8_t;
|
||||||
|
typedef grub_uint16_t grub_efi_char16_t;
|
||||||
|
|
||||||
|
+
|
||||||
|
typedef grub_efi_uintn_t grub_efi_status_t;
|
||||||
|
+/* Make grub_efi_status_t reasonably printable. */
|
||||||
|
+#if GRUB_CPU_SIZEOF_VOID_P == 8
|
||||||
|
+#define PRIxGRUB_EFI_STATUS "lx"
|
||||||
|
+#define PRIdGRUB_EFI_STATUS "ld"
|
||||||
|
+#else
|
||||||
|
+#define PRIxGRUB_EFI_STATUS "llx"
|
||||||
|
+#define PRIdGRUB_EFI_STATUS "lld"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#define GRUB_EFI_ERROR_CODE(value) \
|
||||||
|
((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 26 Jun 2017 12:44:59 -0400
|
||||||
|
Subject: [PATCH] don't use int for efi status
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/kern/efi/efi.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
|
||||||
|
index 05d8237a9b2..ae9885edb84 100644
|
||||||
|
--- a/grub-core/kern/efi/efi.c
|
||||||
|
+++ b/grub-core/kern/efi/efi.c
|
||||||
|
@@ -167,7 +167,7 @@ grub_reboot (void)
|
||||||
|
void
|
||||||
|
grub_exit (int retval)
|
||||||
|
{
|
||||||
|
- int rc = GRUB_EFI_LOAD_ERROR;
|
||||||
|
+ grub_efi_status_t rc = GRUB_EFI_LOAD_ERROR;
|
||||||
|
|
||||||
|
if (retval == 0)
|
||||||
|
rc = GRUB_EFI_SUCCESS;
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 26 Jun 2017 12:46:23 -0400
|
||||||
|
Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
|
||||||
|
|
||||||
|
---
|
||||||
|
include/grub/dl.h | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/include/grub/dl.h b/include/grub/dl.h
|
||||||
|
index b3753c9ca26..91933b85f2c 100644
|
||||||
|
--- a/include/grub/dl.h
|
||||||
|
+++ b/include/grub/dl.h
|
||||||
|
@@ -54,6 +54,7 @@ grub_mod_fini (void)
|
||||||
|
|
||||||
|
#define GRUB_MOD_INIT(name) \
|
||||||
|
static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
|
||||||
|
+extern void grub_##name##_init (void); \
|
||||||
|
void \
|
||||||
|
grub_##name##_init (void) { grub_mod_init (0); } \
|
||||||
|
static void \
|
||||||
|
@@ -61,6 +62,7 @@ grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
|
||||||
|
|
||||||
|
#define GRUB_MOD_FINI(name) \
|
||||||
|
static void grub_mod_fini (void) __attribute__ ((used)); \
|
||||||
|
+extern void grub_##name##_fini (void); \
|
||||||
|
void \
|
||||||
|
grub_##name##_fini (void) { grub_mod_fini (); } \
|
||||||
|
static void \
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 20 Apr 2017 13:29:06 -0400
|
||||||
|
Subject: [PATCH] Don't guess /boot/efi/ as HFS+ on ppc machines in
|
||||||
|
grub-install
|
||||||
|
|
||||||
|
This should never be trying this, and since we've consolidated the
|
||||||
|
grubenv to always be on /boot/efi/EFI/fedora/, this code causes it to
|
||||||
|
always make the wrong decision.
|
||||||
|
|
||||||
|
Resolves: rhbz#1484474
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub-install.c | 12 +-----------
|
||||||
|
1 file changed, 1 insertion(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
||||||
|
index 84ed6e88ecb..a2bec7446cb 100644
|
||||||
|
--- a/util/grub-install.c
|
||||||
|
+++ b/util/grub-install.c
|
||||||
|
@@ -1190,18 +1190,8 @@ main (int argc, char *argv[])
|
||||||
|
char *d;
|
||||||
|
|
||||||
|
is_guess = 1;
|
||||||
|
- d = grub_util_path_concat (2, bootdir, "macppc");
|
||||||
|
- if (!grub_util_is_directory (d))
|
||||||
|
- {
|
||||||
|
- free (d);
|
||||||
|
- d = grub_util_path_concat (2, bootdir, "efi");
|
||||||
|
- }
|
||||||
|
/* Find the Mac HFS(+) System Partition. */
|
||||||
|
- if (!grub_util_is_directory (d))
|
||||||
|
- {
|
||||||
|
- free (d);
|
||||||
|
- d = grub_util_path_concat (2, bootdir, "EFI");
|
||||||
|
- }
|
||||||
|
+ d = grub_util_path_concat (2, bootdir, "macppc");
|
||||||
|
if (!grub_util_is_directory (d))
|
||||||
|
{
|
||||||
|
free (d);
|
||||||
@ -0,0 +1,47 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 9 Jul 2019 14:31:19 +0200
|
||||||
|
Subject: [PATCH] 20_linux_xen: load xen or multiboot{,2} modules as needed.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub.d/20_linux_xen.in | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
||||||
|
index e9e73b815fb..c23b064be6c 100644
|
||||||
|
--- a/util/grub.d/20_linux_xen.in
|
||||||
|
+++ b/util/grub.d/20_linux_xen.in
|
||||||
|
@@ -153,6 +153,7 @@ linux_entry_xsm ()
|
||||||
|
else
|
||||||
|
xen_rm_opts="no-real-mode edd=off"
|
||||||
|
fi
|
||||||
|
+ insmod ${xen_module}
|
||||||
|
${xen_loader} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
|
||||||
|
echo '$(echo "$lmessage" | grub_quote)'
|
||||||
|
${module_loader} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
|
||||||
|
@@ -166,6 +167,7 @@ EOF
|
||||||
|
done
|
||||||
|
sed "s/^/$submenu_indentation/" << EOF
|
||||||
|
echo '$(echo "$message" | grub_quote)'
|
||||||
|
+ insmod ${xen_module}
|
||||||
|
${module_loader} --nounzip $(echo $initrd_path)
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
@@ -253,13 +255,16 @@ while [ "x${xen_list}" != "x" ] ; do
|
||||||
|
echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
|
||||||
|
fi
|
||||||
|
if ($grub_file --is-arm64-efi $current_xen); then
|
||||||
|
+ xen_module="xen_boot"
|
||||||
|
xen_loader="xen_hypervisor"
|
||||||
|
module_loader="xen_module"
|
||||||
|
else
|
||||||
|
if ($grub_file --is-x86-multiboot2 $current_xen); then
|
||||||
|
+ xen_module="multiboot2"
|
||||||
|
xen_loader="multiboot2"
|
||||||
|
module_loader="module2"
|
||||||
|
else
|
||||||
|
+ xen_module="multiboot"
|
||||||
|
xen_loader="multiboot"
|
||||||
|
module_loader="module"
|
||||||
|
fi
|
||||||
@ -0,0 +1,211 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 7 Nov 2017 17:12:17 -0500
|
||||||
|
Subject: [PATCH] Make pmtimer tsc calibration not take 51 seconds to fail.
|
||||||
|
|
||||||
|
On my laptop running at 2.4GHz, if I run a VM where tsc calibration
|
||||||
|
using pmtimer will fail presuming a broken pmtimer, it takes ~51 seconds
|
||||||
|
to do so (as measured with the stopwatch on my phone), with a tsc delta
|
||||||
|
of 0x1cd1c85300, or around 125 billion cycles.
|
||||||
|
|
||||||
|
If instead of trying to wait for 5-200ms to show up on the pmtimer, we try
|
||||||
|
to wait for 5-200us, it decides it's broken in ~0x2626aa0 TSCs, aka ~2.4
|
||||||
|
million cycles, or more or less instantly.
|
||||||
|
|
||||||
|
Additionally, this reading the pmtimer was returning 0xffffffff anyway,
|
||||||
|
and that's obviously an invalid return. I've added a check for that and
|
||||||
|
0 so we don't bother waiting for the test if what we're seeing is dead
|
||||||
|
pins with no response at all.
|
||||||
|
|
||||||
|
If "debug" is includes "pmtimer", you will see one of the following
|
||||||
|
three outcomes. If pmtimer gives all 0 or all 1 bits, you will see:
|
||||||
|
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 1
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 2
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 3
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 4
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 5
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 6
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 7
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 8
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 9
|
||||||
|
kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 10
|
||||||
|
kern/i386/tsc_pmtimer.c:78: timer is broken; giving up.
|
||||||
|
|
||||||
|
This outcome was tested using qemu+kvm with UEFI (OVMF) firmware and
|
||||||
|
these options: -machine pc-q35-2.10 -cpu Broadwell-noTSX
|
||||||
|
|
||||||
|
If pmtimer gives any other bit patterns but is not actually marching
|
||||||
|
forward fast enough to use for clock calibration, you will see:
|
||||||
|
|
||||||
|
kern/i386/tsc_pmtimer.c:121: pmtimer delta is 0x0 (1904 iterations)
|
||||||
|
kern/i386/tsc_pmtimer.c:124: tsc delta is implausible: 0x2626aa0
|
||||||
|
|
||||||
|
This outcome was tested using grub compiled with GRUB_PMTIMER_IGNORE_BAD_READS
|
||||||
|
defined (so as not to trip the bad read test) using qemu+kvm with UEFI
|
||||||
|
(OVMF) firmware, and these options: -machine pc-q35-2.10 -cpu Broadwell-noTSX
|
||||||
|
|
||||||
|
If pmtimer actually works, you'll see something like:
|
||||||
|
|
||||||
|
kern/i386/tsc_pmtimer.c:121: pmtimer delta is 0x0 (1904 iterations)
|
||||||
|
kern/i386/tsc_pmtimer.c:124: tsc delta is implausible: 0x2626aa0
|
||||||
|
|
||||||
|
This outcome was tested using qemu+kvm with UEFI (OVMF) firmware, and
|
||||||
|
these options: -machine pc-i440fx-2.4 -cpu Broadwell-noTSX
|
||||||
|
|
||||||
|
I've also tested this outcome on a real Intel Xeon E3-1275v3 on an Intel
|
||||||
|
Server Board S1200V3RPS using the SDV.RP.B8 "Release" build here:
|
||||||
|
https://firmware.intel.com/sites/default/files/UEFIDevKit_S1200RP_vB8.zip
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/kern/i386/tsc_pmtimer.c | 109 +++++++++++++++++++++++++++++++-------
|
||||||
|
1 file changed, 89 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c
|
||||||
|
index c9c36169978..ca15c3aacd7 100644
|
||||||
|
--- a/grub-core/kern/i386/tsc_pmtimer.c
|
||||||
|
+++ b/grub-core/kern/i386/tsc_pmtimer.c
|
||||||
|
@@ -28,40 +28,101 @@
|
||||||
|
#include <grub/acpi.h>
|
||||||
|
#include <grub/cpu/io.h>
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * Define GRUB_PMTIMER_IGNORE_BAD_READS if you're trying to test a timer that's
|
||||||
|
+ * present but doesn't keep time well.
|
||||||
|
+ */
|
||||||
|
+// #define GRUB_PMTIMER_IGNORE_BAD_READS
|
||||||
|
+
|
||||||
|
grub_uint64_t
|
||||||
|
grub_pmtimer_wait_count_tsc (grub_port_t pmtimer,
|
||||||
|
grub_uint16_t num_pm_ticks)
|
||||||
|
{
|
||||||
|
grub_uint32_t start;
|
||||||
|
- grub_uint32_t last;
|
||||||
|
- grub_uint32_t cur, end;
|
||||||
|
+ grub_uint64_t cur, end;
|
||||||
|
grub_uint64_t start_tsc;
|
||||||
|
grub_uint64_t end_tsc;
|
||||||
|
- int num_iter = 0;
|
||||||
|
+ unsigned int num_iter = 0;
|
||||||
|
+#ifndef GRUB_PMTIMER_IGNORE_BAD_READS
|
||||||
|
+ int bad_reads = 0;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
- start = grub_inl (pmtimer) & 0xffffff;
|
||||||
|
- last = start;
|
||||||
|
+ /*
|
||||||
|
+ * Some timers are 24-bit and some are 32-bit, but it doesn't make much
|
||||||
|
+ * difference to us. Caring which one we have isn't really worth it since
|
||||||
|
+ * the low-order digits will give us enough data to calibrate TSC. So just
|
||||||
|
+ * mask the top-order byte off.
|
||||||
|
+ */
|
||||||
|
+ cur = start = grub_inl (pmtimer) & 0xffffffUL;
|
||||||
|
end = start + num_pm_ticks;
|
||||||
|
start_tsc = grub_get_tsc ();
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
- cur = grub_inl (pmtimer) & 0xffffff;
|
||||||
|
- if (cur < last)
|
||||||
|
- cur |= 0x1000000;
|
||||||
|
- num_iter++;
|
||||||
|
+ cur &= 0xffffffffff000000ULL;
|
||||||
|
+ cur |= grub_inl (pmtimer) & 0xffffffUL;
|
||||||
|
+
|
||||||
|
+ end_tsc = grub_get_tsc();
|
||||||
|
+
|
||||||
|
+#ifndef GRUB_PMTIMER_IGNORE_BAD_READS
|
||||||
|
+ /*
|
||||||
|
+ * If we get 10 reads in a row that are obviously dead pins, there's no
|
||||||
|
+ * reason to do this thousands of times.
|
||||||
|
+ */
|
||||||
|
+ if (cur == 0xffffffUL || cur == 0)
|
||||||
|
+ {
|
||||||
|
+ bad_reads++;
|
||||||
|
+ grub_dprintf ("pmtimer",
|
||||||
|
+ "pmtimer: 0x%"PRIxGRUB_UINT64_T" bad_reads: %d\n",
|
||||||
|
+ cur, bad_reads);
|
||||||
|
+ grub_dprintf ("pmtimer", "timer is broken; giving up.\n");
|
||||||
|
+
|
||||||
|
+ if (bad_reads == 10)
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ if (cur < start)
|
||||||
|
+ cur += 0x1000000;
|
||||||
|
+
|
||||||
|
if (cur >= end)
|
||||||
|
{
|
||||||
|
- end_tsc = grub_get_tsc ();
|
||||||
|
+ grub_dprintf ("pmtimer", "pmtimer delta is 0x%"PRIxGRUB_UINT64_T"\n",
|
||||||
|
+ cur - start);
|
||||||
|
+ grub_dprintf ("pmtimer", "tsc delta is 0x%"PRIxGRUB_UINT64_T"\n",
|
||||||
|
+ end_tsc - start_tsc);
|
||||||
|
return end_tsc - start_tsc;
|
||||||
|
}
|
||||||
|
- /* Check for broken PM timer.
|
||||||
|
- 50000000 TSCs is between 5 ms (10GHz) and 200 ms (250 MHz)
|
||||||
|
- if after this time we still don't have 1 ms on pmtimer, then
|
||||||
|
- pmtimer is broken.
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Check for broken PM timer. 1ms at 10GHz should be 1E+7 TSCs; at
|
||||||
|
+ * 250MHz it should be 2.5E6. So if after 4E+7 TSCs on a 10GHz machine,
|
||||||
|
+ * we should have seen pmtimer show 4ms of change (i.e. cur =~
|
||||||
|
+ * start+14320); on a 250MHz machine that should be 16ms (start+57280).
|
||||||
|
+ * If after this a time we still don't have 1ms on pmtimer, then pmtimer
|
||||||
|
+ * is broken.
|
||||||
|
+ *
|
||||||
|
+ * Likewise, if our code is perfectly efficient and introduces no delays
|
||||||
|
+ * whatsoever, on a 10GHz system we should see a TSC delta of 3580 in
|
||||||
|
+ * ~3580 iterations. On a 250MHz machine that should be ~900 iterations.
|
||||||
|
+ *
|
||||||
|
+ * With those factors in mind, there are two limits here. There's a hard
|
||||||
|
+ * limit here at 8x our desired pm timer delta, picked as an arbitrarily
|
||||||
|
+ * large value that's still not a lot of time to humans, because if we
|
||||||
|
+ * get that far this is either an implausibly fast machine or the pmtimer
|
||||||
|
+ * is not running. And there's another limit on 4x our 10GHz tsc delta
|
||||||
|
+ * without seeing cur converge on our target value.
|
||||||
|
*/
|
||||||
|
- if ((num_iter & 0xffffff) == 0 && grub_get_tsc () - start_tsc > 5000000) {
|
||||||
|
- return 0;
|
||||||
|
- }
|
||||||
|
+ if ((++num_iter > (grub_uint32_t)num_pm_ticks << 3UL) ||
|
||||||
|
+ end_tsc - start_tsc > 40000000)
|
||||||
|
+ {
|
||||||
|
+ grub_dprintf ("pmtimer",
|
||||||
|
+ "pmtimer delta is 0x%"PRIxGRUB_UINT64_T" (%u iterations)\n",
|
||||||
|
+ cur - start, num_iter);
|
||||||
|
+ grub_dprintf ("pmtimer",
|
||||||
|
+ "tsc delta is implausible: 0x%"PRIxGRUB_UINT64_T"\n",
|
||||||
|
+ end_tsc - start_tsc);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -74,12 +135,20 @@ grub_tsc_calibrate_from_pmtimer (void)
|
||||||
|
|
||||||
|
fadt = grub_acpi_find_fadt ();
|
||||||
|
if (!fadt)
|
||||||
|
- return 0;
|
||||||
|
+ {
|
||||||
|
+ grub_dprintf ("pmtimer", "No FADT found; not using pmtimer.\n");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
pmtimer = fadt->pmtimer;
|
||||||
|
if (!pmtimer)
|
||||||
|
- return 0;
|
||||||
|
+ {
|
||||||
|
+ grub_dprintf ("pmtimer", "FADT does not specify pmtimer; skipping.\n");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- /* It's 3.579545 MHz clock. Wait 1 ms. */
|
||||||
|
+ /*
|
||||||
|
+ * It's 3.579545 MHz clock. Wait 1 ms.
|
||||||
|
+ */
|
||||||
|
tsc_diff = grub_pmtimer_wait_count_tsc (pmtimer, 3580);
|
||||||
|
if (tsc_diff == 0)
|
||||||
|
return 0;
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 27 Feb 2018 13:55:35 -0500
|
||||||
|
Subject: [PATCH] align struct efi_variable better...
|
||||||
|
|
||||||
|
---
|
||||||
|
include/grub/efiemu/runtime.h | 2 +-
|
||||||
|
include/grub/types.h | 1 +
|
||||||
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
|
||||||
|
index 36d2dedf47e..9d93ba88bac 100644
|
||||||
|
--- a/include/grub/efiemu/runtime.h
|
||||||
|
+++ b/include/grub/efiemu/runtime.h
|
||||||
|
@@ -33,5 +33,5 @@ struct efi_variable
|
||||||
|
grub_uint32_t namelen;
|
||||||
|
grub_uint32_t size;
|
||||||
|
grub_efi_uint32_t attributes;
|
||||||
|
-} GRUB_PACKED;
|
||||||
|
+} GRUB_PACKED GRUB_ALIGNED(8);
|
||||||
|
#endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
|
||||||
|
diff --git a/include/grub/types.h b/include/grub/types.h
|
||||||
|
index 0a3ff159136..ba446d99040 100644
|
||||||
|
--- a/include/grub/types.h
|
||||||
|
+++ b/include/grub/types.h
|
||||||
|
@@ -29,6 +29,7 @@
|
||||||
|
#else
|
||||||
|
#define GRUB_PACKED __attribute__ ((packed))
|
||||||
|
#endif
|
||||||
|
+#define GRUB_ALIGNED(x) __attribute__((aligned (x)))
|
||||||
|
|
||||||
|
#ifdef GRUB_BUILD
|
||||||
|
# define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P
|
||||||
@ -0,0 +1,397 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Fri, 9 Dec 2016 15:40:29 -0500
|
||||||
|
Subject: [PATCH] Add BLS support to grub-mkconfig
|
||||||
|
|
||||||
|
GRUB now has BootLoaderSpec support, the user can choose to use this by
|
||||||
|
setting GRUB_ENABLE_BLSCFG to true in /etc/default/grub. On this setup,
|
||||||
|
the boot menu entries are not added to the grub.cfg, instead BLS config
|
||||||
|
files are parsed by blscfg command and the entries created dynamically.
|
||||||
|
|
||||||
|
A 10_linux_bls grub.d snippet to generate menu entries from BLS files
|
||||||
|
is also added that can be used on platforms where the bootloader doesn't
|
||||||
|
have BLS support and only can parse a normal grub configuration file.
|
||||||
|
|
||||||
|
Portions of the 10_linux_bls were taken from the ostree-grub-generator
|
||||||
|
script that's included in the OSTree project.
|
||||||
|
|
||||||
|
Fixes to support multi-devices and generate a BLS section even if no
|
||||||
|
kernels are found in the boot directory were proposed by Yclept Nemo
|
||||||
|
and Tom Gundersen respectively.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub-mkconfig.8 | 4 +
|
||||||
|
util/grub-mkconfig.in | 9 +-
|
||||||
|
util/grub-mkconfig_lib.in | 22 ++++-
|
||||||
|
util/grub.d/10_linux.in | 223 +++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
|
4 files changed, 252 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
|
||||||
|
index a2d1f577b9b..434fa4deda4 100644
|
||||||
|
--- a/util/grub-mkconfig.8
|
||||||
|
+++ b/util/grub-mkconfig.8
|
||||||
|
@@ -13,5 +13,9 @@
|
||||||
|
\fB--output\fR=\fIFILE\fR
|
||||||
|
Write generated output to \fIFILE\fR.
|
||||||
|
|
||||||
|
+.TP
|
||||||
|
+\fB--no-grubenv-update\fR
|
||||||
|
+Do not update variables in the grubenv file.
|
||||||
|
+
|
||||||
|
.SH SEE ALSO
|
||||||
|
.BR "info grub"
|
||||||
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||||
|
index 535c0f02499..f55339a3f64 100644
|
||||||
|
--- a/util/grub-mkconfig.in
|
||||||
|
+++ b/util/grub-mkconfig.in
|
||||||
|
@@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
|
||||||
|
export TEXTDOMAIN=@PACKAGE@
|
||||||
|
export TEXTDOMAINDIR="@localedir@"
|
||||||
|
|
||||||
|
+export GRUB_GRUBENV_UPDATE="yes"
|
||||||
|
+
|
||||||
|
. "${pkgdatadir}/grub-mkconfig_lib"
|
||||||
|
|
||||||
|
# Usage: usage
|
||||||
|
@@ -59,6 +61,7 @@ usage () {
|
||||||
|
gettext "Generate a grub config file"; echo
|
||||||
|
echo
|
||||||
|
print_option_help "-o, --output=$(gettext FILE)" "$(gettext "output generated config to FILE [default=stdout]")"
|
||||||
|
+ print_option_help "--no-grubenv-update" "$(gettext "do not update variables in the grubenv file")"
|
||||||
|
print_option_help "-h, --help" "$(gettext "print this message and exit")"
|
||||||
|
print_option_help "-V, --version" "$(gettext "print the version information and exit")"
|
||||||
|
echo
|
||||||
|
@@ -94,6 +97,9 @@ do
|
||||||
|
--output=*)
|
||||||
|
grub_cfg=`echo "$option" | sed 's/--output=//'`
|
||||||
|
;;
|
||||||
|
+ --no-grubenv-update)
|
||||||
|
+ GRUB_GRUBENV_UPDATE="no"
|
||||||
|
+ ;;
|
||||||
|
-*)
|
||||||
|
gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
|
||||||
|
usage
|
||||||
|
@@ -253,7 +259,8 @@ export GRUB_DEFAULT \
|
||||||
|
GRUB_OS_PROBER_SKIP_LIST \
|
||||||
|
GRUB_DISABLE_SUBMENU \
|
||||||
|
GRUB_DEFAULT_DTB \
|
||||||
|
- SUSE_BTRFS_SNAPSHOT_BOOTING
|
||||||
|
+ SUSE_BTRFS_SNAPSHOT_BOOTING \
|
||||||
|
+ GRUB_ENABLE_BLSCFG
|
||||||
|
|
||||||
|
if test "x${grub_cfg}" != "x"; then
|
||||||
|
rm -f "${grub_cfg}.new"
|
||||||
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
||||||
|
index fafeac95061..d8bb4069360 100644
|
||||||
|
--- a/util/grub-mkconfig_lib.in
|
||||||
|
+++ b/util/grub-mkconfig_lib.in
|
||||||
|
@@ -30,6 +30,9 @@ fi
|
||||||
|
if test "x$grub_file" = x; then
|
||||||
|
grub_file="${bindir}/@grub_file@"
|
||||||
|
fi
|
||||||
|
+if test "x$grub_editenv" = x; then
|
||||||
|
+ grub_editenv="${bindir}/@grub_editenv@"
|
||||||
|
+fi
|
||||||
|
if test "x$grub_mkrelpath" = x; then
|
||||||
|
grub_mkrelpath="${bindir}/@grub_mkrelpath@"
|
||||||
|
fi
|
||||||
|
@@ -125,8 +128,19 @@ EOF
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
+prepare_grub_to_access_device_with_variable ()
|
||||||
|
+{
|
||||||
|
+ device_variable="$1"
|
||||||
|
+ shift
|
||||||
|
+ prepare_grub_to_access_device "$@"
|
||||||
|
+ unset "device_variable"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
prepare_grub_to_access_device ()
|
||||||
|
{
|
||||||
|
+ if [ -z "$device_variable" ]; then
|
||||||
|
+ device_variable="root"
|
||||||
|
+ fi
|
||||||
|
old_ifs="$IFS"
|
||||||
|
IFS='
|
||||||
|
'
|
||||||
|
@@ -161,18 +175,18 @@ prepare_grub_to_access_device ()
|
||||||
|
# otherwise set root as per value in device.map.
|
||||||
|
fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
|
||||||
|
if [ "x$fs_hint" != x ]; then
|
||||||
|
- echo "set root='$fs_hint'"
|
||||||
|
+ echo "set ${device_variable}='$fs_hint'"
|
||||||
|
fi
|
||||||
|
if [ "x${GRUB_DISABLE_UUID}" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
|
||||||
|
hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=
|
||||||
|
if [ "x$hints" != x ]; then
|
||||||
|
echo "if [ x\$feature_platform_search_hint = xy ]; then"
|
||||||
|
- echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
|
||||||
|
+ echo " search --no-floppy --fs-uuid --set=${device_variable} ${hints} ${fs_uuid}"
|
||||||
|
echo "else"
|
||||||
|
- echo " search --no-floppy --fs-uuid --set=root ${fs_uuid}"
|
||||||
|
+ echo " search --no-floppy --fs-uuid --set=${device_variable} ${fs_uuid}"
|
||||||
|
echo "fi"
|
||||||
|
else
|
||||||
|
- echo "search --no-floppy --fs-uuid --set=root ${fs_uuid}"
|
||||||
|
+ echo "search --no-floppy --fs-uuid --set=${device_variable} ${fs_uuid}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
IFS="$old_ifs"
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index cbfaca34cc7..68adb55d893 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -82,6 +82,223 @@ case x"$GRUB_FS" in
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
+populate_header_warn()
|
||||||
|
+{
|
||||||
|
+if [ "x${BLS_POPULATE_MENU}" = "xtrue" ]; then
|
||||||
|
+ bls_parser="10_linux script"
|
||||||
|
+else
|
||||||
|
+ bls_parser="blscfg command"
|
||||||
|
+fi
|
||||||
|
+cat <<EOF
|
||||||
|
+
|
||||||
|
+# This section was generated by a script. Do not modify the generated file - all changes
|
||||||
|
+# will be lost the next time file is regenerated. Instead edit the BootLoaderSpec files.
|
||||||
|
+#
|
||||||
|
+# The $bls_parser parses the BootLoaderSpec files stored in /boot/loader/entries and
|
||||||
|
+# populates the boot menu. Please refer to the Boot Loader Specification documentation
|
||||||
|
+# for the files format: https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/.
|
||||||
|
+
|
||||||
|
+EOF
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+read_config()
|
||||||
|
+{
|
||||||
|
+ config_file=${1}
|
||||||
|
+ title=""
|
||||||
|
+ initrd=""
|
||||||
|
+ options=""
|
||||||
|
+ linux=""
|
||||||
|
+ grub_arg=""
|
||||||
|
+
|
||||||
|
+ while read -r line
|
||||||
|
+ do
|
||||||
|
+ record=$(echo ${line} | cut -f 1 -d ' ')
|
||||||
|
+ value=$(echo ${line} | cut -s -f2- -d ' ')
|
||||||
|
+ case "${record}" in
|
||||||
|
+ "title")
|
||||||
|
+ title=${value}
|
||||||
|
+ ;;
|
||||||
|
+ "initrd")
|
||||||
|
+ initrd=${value}
|
||||||
|
+ ;;
|
||||||
|
+ "linux")
|
||||||
|
+ linux=${value}
|
||||||
|
+ ;;
|
||||||
|
+ "options")
|
||||||
|
+ options=${value}
|
||||||
|
+ ;;
|
||||||
|
+ "grub_arg")
|
||||||
|
+ grub_arg=${value}
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ done < ${config_file}
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+blsdir="/boot/loader/entries"
|
||||||
|
+
|
||||||
|
+get_sorted_bls()
|
||||||
|
+{
|
||||||
|
+ if ! [ -d "${blsdir}" ] || ! [ -e /etc/machine-id ]; then
|
||||||
|
+ return
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ read machine_id < /etc/machine-id
|
||||||
|
+ if [ -z "${machine_id}" ]; then
|
||||||
|
+ return
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ local IFS=$'\n'
|
||||||
|
+
|
||||||
|
+ files=($(for bls in ${blsdir}/${machine_id}-*.conf; do
|
||||||
|
+ if ! [[ -e "${bls}" ]] ; then
|
||||||
|
+ continue
|
||||||
|
+ fi
|
||||||
|
+ bls="${bls%.conf}"
|
||||||
|
+ bls="${bls##*/}"
|
||||||
|
+ echo "${bls}"
|
||||||
|
+ done | ${kernel_sort} 2>/dev/null | tac)) || :
|
||||||
|
+
|
||||||
|
+ echo "${files[@]}"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+update_bls_cmdline()
|
||||||
|
+{
|
||||||
|
+ local cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||||
|
+ local -a files=($(get_sorted_bls))
|
||||||
|
+
|
||||||
|
+ for bls in "${files[@]}"; do
|
||||||
|
+ local options="${cmdline}"
|
||||||
|
+ if [ -z "${bls##*debug*}" ]; then
|
||||||
|
+ options="${options} ${GRUB_CMDLINE_LINUX_DEBUG}"
|
||||||
|
+ fi
|
||||||
|
+ options="$(echo "${options}" | sed -e 's/\//\\\//g')"
|
||||||
|
+ sed -i -e "s/^options.*/options ${options}/" "${blsdir}/${bls}.conf"
|
||||||
|
+ done
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+populate_menu()
|
||||||
|
+{
|
||||||
|
+ local -a files=($(get_sorted_bls))
|
||||||
|
+
|
||||||
|
+ gettext_printf "Generating boot entries from BLS files...\n" >&2
|
||||||
|
+
|
||||||
|
+ for bls in "${files[@]}"; do
|
||||||
|
+ read_config "${blsdir}/${bls}.conf"
|
||||||
|
+
|
||||||
|
+ menu="${menu}menuentry '${title}' ${grub_arg} --id=${bls} {\n"
|
||||||
|
+ menu="${menu}\t linux ${linux} ${options}\n"
|
||||||
|
+ if [ -n "${initrd}" ] ; then
|
||||||
|
+ menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
|
||||||
|
+ fi
|
||||||
|
+ menu="${menu}}\n\n"
|
||||||
|
+ done
|
||||||
|
+ # The printf command seems to be more reliable across shells for special character (\n, \t) evaluation
|
||||||
|
+ printf "$menu"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# Make BLS the default if GRUB_ENABLE_BLSCFG was not set and grubby is not installed.
|
||||||
|
+if [ -z "${GRUB_ENABLE_BLSCFG}" ] && [ -z "$(which new-kernel-pkg 2> /dev/null)" ]; then
|
||||||
|
+ GRUB_ENABLE_BLSCFG="true"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then
|
||||||
|
+ if [ x$dirname = x/ ]; then
|
||||||
|
+ if [ -z "${prepare_root_cache}" ]; then
|
||||||
|
+ prepare_grub_to_access_device ${GRUB_DEVICE}
|
||||||
|
+ fi
|
||||||
|
+ else
|
||||||
|
+ if [ -z "${prepare_boot_cache}" ]; then
|
||||||
|
+ prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -d /sys/firmware/efi ]; then
|
||||||
|
+ bootefi_device="`${grub_probe} --target=device /boot/efi/`"
|
||||||
|
+ prepare_grub_to_access_device_with_variable boot ${bootefi_device}
|
||||||
|
+ else
|
||||||
|
+ boot_device="`${grub_probe} --target=device /boot/`"
|
||||||
|
+ prepare_grub_to_access_device_with_variable boot ${boot_device}
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ arch="$(uname -m)"
|
||||||
|
+ if [ "x${arch}" = "xppc64le" ] && [ -d /sys/firmware/opal ]; then
|
||||||
|
+
|
||||||
|
+ BLS_POPULATE_MENU="true"
|
||||||
|
+ petitboot_path="/sys/firmware/devicetree/base/ibm,firmware-versions/petitboot"
|
||||||
|
+
|
||||||
|
+ if test -e ${petitboot_path}; then
|
||||||
|
+ read -r -d '' petitboot_version < ${petitboot_path}
|
||||||
|
+ petitboot_version="$(echo ${petitboot_version//v})"
|
||||||
|
+
|
||||||
|
+ if test -n ${petitboot_version}; then
|
||||||
|
+ major_version="$(echo ${petitboot_version} | cut -d . -f1)"
|
||||||
|
+ minor_version="$(echo ${petitboot_version} | cut -d . -f2)"
|
||||||
|
+
|
||||||
|
+ re='^[0-9]+$'
|
||||||
|
+ if [[ $major_version =~ $re ]] && [[ $minor_version =~ $re ]] &&
|
||||||
|
+ ([[ ${major_version} -gt 1 ]] ||
|
||||||
|
+ [[ ${major_version} -eq 1 &&
|
||||||
|
+ ${minor_version} -ge 8 ]]); then
|
||||||
|
+ BLS_POPULATE_MENU="false"
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ populate_header_warn
|
||||||
|
+
|
||||||
|
+ cat << EOF
|
||||||
|
+# The kernelopts variable should be defined in the grubenv file. But to ensure that menu
|
||||||
|
+# entries populated from BootLoaderSpec files that use this variable work correctly even
|
||||||
|
+# without a grubenv file, define a fallback kernelopts variable if this has not been set.
|
||||||
|
+#
|
||||||
|
+# The kernelopts variable in the grubenv file can be modified using the grubby tool or by
|
||||||
|
+# executing the grub2-mkconfig tool. For the latter, the values of the GRUB_CMDLINE_LINUX
|
||||||
|
+# and GRUB_CMDLINE_LINUX_DEFAULT options from /etc/default/grub file are used to set both
|
||||||
|
+# the kernelopts variable in the grubenv file and the fallback kernelopts variable.
|
||||||
|
+if [ -z "\${kernelopts}" ]; then
|
||||||
|
+ set kernelopts="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||||
|
+fi
|
||||||
|
+EOF
|
||||||
|
+
|
||||||
|
+ update_bls_cmdline
|
||||||
|
+
|
||||||
|
+ if [ "x${BLS_POPULATE_MENU}" = "xtrue" ]; then
|
||||||
|
+ populate_menu
|
||||||
|
+ else
|
||||||
|
+ cat << EOF
|
||||||
|
+
|
||||||
|
+insmod blscfg
|
||||||
|
+blscfg
|
||||||
|
+EOF
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ "x${GRUB_GRUBENV_UPDATE}" = "xyes" ]; then
|
||||||
|
+ blsdir="/boot/loader/entries"
|
||||||
|
+ [ -d "${blsdir}" ] && GRUB_BLS_FS="$(${grub_probe} --target=fs ${blsdir})"
|
||||||
|
+ if [ "x${GRUB_BLS_FS}" = "xbtrfs" ] || [ "x${GRUB_BLS_FS}" = "xzfs" ]; then
|
||||||
|
+ blsdir=$(make_system_path_relative_to_its_root "${blsdir}")
|
||||||
|
+ if [ "x${blsdir}" != "x/loader/entries" ] && [ "x${blsdir}" != "x/boot/loader/entries" ]; then
|
||||||
|
+ ${grub_editenv} - set blsdir="${blsdir}"
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -n "${GRUB_EARLY_INITRD_LINUX_CUSTOM}" ]; then
|
||||||
|
+ ${grub_editenv} - set early_initrd="${GRUB_EARLY_INITRD_LINUX_CUSTOM}"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -n "${GRUB_DEFAULT_DTB}" ]; then
|
||||||
|
+ ${grub_editenv} - set devicetree="${GRUB_DEFAULT_DTB}"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -n "${GRUB_SAVEDEFAULT}" ]; then
|
||||||
|
+ ${grub_editenv} - set save_default="${GRUB_SAVEDEFAULT}"
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ exit 0
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
mktitle ()
|
||||||
|
{
|
||||||
|
local title_type
|
||||||
|
@@ -121,6 +338,7 @@ linux_entry ()
|
||||||
|
if [ -z "$boot_device_id" ]; then
|
||||||
|
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
if [ x$type != xsimple ] ; then
|
||||||
|
title=$(mktitle "$type" "$version")
|
||||||
|
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
||||||
|
@@ -224,6 +442,7 @@ is_top_level=true
|
||||||
|
while [ "x$list" != "x" ] ; do
|
||||||
|
linux=`version_find_latest $list`
|
||||||
|
gettext_printf "Found linux image: %s\n" "$linux" >&2
|
||||||
|
+
|
||||||
|
basename=`basename $linux`
|
||||||
|
dirname=`dirname $linux`
|
||||||
|
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
||||||
|
@@ -262,7 +481,9 @@ while [ "x$list" != "x" ] ; do
|
||||||
|
for i in ${initrd}; do
|
||||||
|
initrd_display="${initrd_display} ${dirname}/${i}"
|
||||||
|
done
|
||||||
|
- gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
|
||||||
|
+ if [ "x${GRUB_ENABLE_BLSCFG}" != "xtrue" ]; then
|
||||||
|
+ gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
fdt=
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Tue, 6 Feb 2018 11:16:28 +0100
|
||||||
|
Subject: [PATCH] Don't attempt to backtrace on grub_abort() for grub-emu
|
||||||
|
|
||||||
|
The emu platform doesn't have a grub_backtrace() implementation, so this
|
||||||
|
causes a build error. Don't attempt to call this when building grub-emu.
|
||||||
|
|
||||||
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/kern/misc.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
||||||
|
index a3e215155bd..c60601b699d 100644
|
||||||
|
--- a/grub-core/kern/misc.c
|
||||||
|
+++ b/grub-core/kern/misc.c
|
||||||
|
@@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn))
|
||||||
|
grub_abort (void)
|
||||||
|
{
|
||||||
|
#ifndef GRUB_UTIL
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__)
|
||||||
|
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_EMU)
|
||||||
|
grub_backtrace();
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
@ -0,0 +1,347 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Tue, 6 Feb 2018 09:09:00 +0100
|
||||||
|
Subject: [PATCH] Add linux and initrd commands for grub-emu
|
||||||
|
|
||||||
|
When using grub-emu, the linux and initrd commands are used as arguments
|
||||||
|
to the kexec command line tool, to allow booting the selected menu entry.
|
||||||
|
---
|
||||||
|
grub-core/Makefile.core.def | 1 -
|
||||||
|
grub-core/kern/emu/main.c | 4 +
|
||||||
|
grub-core/kern/emu/misc.c | 18 ++++-
|
||||||
|
grub-core/loader/emu/linux.c | 172 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
include/grub/emu/exec.h | 4 +-
|
||||||
|
include/grub/emu/hostfile.h | 3 +-
|
||||||
|
include/grub/emu/misc.h | 3 +
|
||||||
|
grub-core/Makefile.am | 1 +
|
||||||
|
8 files changed, 202 insertions(+), 4 deletions(-)
|
||||||
|
create mode 100644 grub-core/loader/emu/linux.c
|
||||||
|
|
||||||
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
||||||
|
index 058c88ac3af..5354f9613d3 100644
|
||||||
|
--- a/grub-core/Makefile.core.def
|
||||||
|
+++ b/grub-core/Makefile.core.def
|
||||||
|
@@ -1826,7 +1826,6 @@ module = {
|
||||||
|
|
||||||
|
common = loader/linux.c;
|
||||||
|
common = lib/cmdline.c;
|
||||||
|
- enable = noemu;
|
||||||
|
|
||||||
|
efi = loader/efi/linux.c;
|
||||||
|
};
|
||||||
|
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
|
||||||
|
index 55ea5a11ccd..846fe9715ec 100644
|
||||||
|
--- a/grub-core/kern/emu/main.c
|
||||||
|
+++ b/grub-core/kern/emu/main.c
|
||||||
|
@@ -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_("try the untryable."), 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:
|
||||||
|
{
|
||||||
|
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
|
||||||
|
index 0ff13bcaf8c..eeea092752d 100644
|
||||||
|
--- a/grub-core/kern/emu/misc.c
|
||||||
|
+++ b/grub-core/kern/emu/misc.c
|
||||||
|
@@ -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 (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *
|
||||||
|
@@ -154,6 +155,9 @@ void
|
||||||
|
__attribute__ ((noreturn))
|
||||||
|
grub_exit (int rc)
|
||||||
|
{
|
||||||
|
+#if defined (GRUB_KERNEL)
|
||||||
|
+ grub_reboot();
|
||||||
|
+#endif
|
||||||
|
exit (rc < 0 ? 1 : rc);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -215,3 +219,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;
|
||||||
|
+}
|
||||||
|
diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..fda9e00d24c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/loader/emu/linux.c
|
||||||
|
@@ -0,0 +1,172 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <grub/loader.h>
|
||||||
|
+#include <grub/dl.h>
|
||||||
|
+#include <grub/command.h>
|
||||||
|
+#include <grub/time.h>
|
||||||
|
+
|
||||||
|
+#include <grub/emu/exec.h>
|
||||||
|
+#include <grub/emu/hostfile.h>
|
||||||
|
+#include <grub/emu/misc.h>
|
||||||
|
+
|
||||||
|
+GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
+
|
||||||
|
+static grub_dl_t my_mod;
|
||||||
|
+
|
||||||
|
+static char *kernel_path;
|
||||||
|
+static char *initrd_path;
|
||||||
|
+static char *boot_cmdline;
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_linux_boot (void)
|
||||||
|
+{
|
||||||
|
+ grub_err_t rc = GRUB_ERR_NONE;
|
||||||
|
+ char *initrd_param;
|
||||||
|
+ const char *kexec[] = { "kexec", "-l", kernel_path, boot_cmdline, NULL, NULL };
|
||||||
|
+ const char *systemctl[] = { "systemctl", "kexec", NULL };
|
||||||
|
+ int kexecute = grub_util_get_kexecute();
|
||||||
|
+
|
||||||
|
+ if (initrd_path) {
|
||||||
|
+ initrd_param = grub_xasprintf("--initrd=%s", initrd_path);
|
||||||
|
+ kexec[3] = initrd_param;
|
||||||
|
+ kexec[4] = boot_cmdline;
|
||||||
|
+ } else {
|
||||||
|
+ initrd_param = grub_xasprintf("%s", "");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_printf("%serforming 'kexec -l %s %s %s'\n",
|
||||||
|
+ (kexecute) ? "P" : "Not p",
|
||||||
|
+ kernel_path, initrd_param, boot_cmdline);
|
||||||
|
+
|
||||||
|
+ if (kexecute)
|
||||||
|
+ rc = grub_util_exec(kexec);
|
||||||
|
+
|
||||||
|
+ grub_free(initrd_param);
|
||||||
|
+
|
||||||
|
+ if (rc != GRUB_ERR_NONE) {
|
||||||
|
+ grub_error (rc, N_("Error trying to perform kexec load operation."));
|
||||||
|
+ grub_sleep (3);
|
||||||
|
+ return rc;
|
||||||
|
+ }
|
||||||
|
+ if (kexecute < 1)
|
||||||
|
+ grub_fatal (N_("Use '"PACKAGE"-emu --kexec' to force a system restart."));
|
||||||
|
+
|
||||||
|
+ grub_printf("Performing 'systemctl kexec' (%s) ",
|
||||||
|
+ (kexecute==1) ? "do-or-die" : "just-in-case");
|
||||||
|
+ rc = grub_util_exec (systemctl);
|
||||||
|
+
|
||||||
|
+ if (kexecute == 1)
|
||||||
|
+ grub_fatal (N_("Error trying to perform 'systemctl kexec'"));
|
||||||
|
+
|
||||||
|
+ /* need to check read-only root before resetting hard!? */
|
||||||
|
+ grub_printf("Performing 'kexec -e'");
|
||||||
|
+ kexec[1] = "-e";
|
||||||
|
+ kexec[2] = NULL;
|
||||||
|
+ rc = grub_util_exec(kexec);
|
||||||
|
+ if ( rc != GRUB_ERR_NONE )
|
||||||
|
+ grub_fatal (N_("Error trying to directly perform 'kexec -e'."));
|
||||||
|
+
|
||||||
|
+ return rc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_linux_unload (void)
|
||||||
|
+{
|
||||||
|
+ grub_dl_unref (my_mod);
|
||||||
|
+ if ( boot_cmdline != NULL )
|
||||||
|
+ grub_free (boot_cmdline);
|
||||||
|
+ boot_cmdline = NULL;
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[])
|
||||||
|
+{
|
||||||
|
+ int i;
|
||||||
|
+ char *tempstr;
|
||||||
|
+
|
||||||
|
+ grub_dl_ref (my_mod);
|
||||||
|
+
|
||||||
|
+ if (argc == 0)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
||||||
|
+
|
||||||
|
+ if ( !grub_util_is_regular(argv[0]) )
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find kernel file %s"), argv[0]);
|
||||||
|
+
|
||||||
|
+ if ( kernel_path != NULL )
|
||||||
|
+ grub_free(kernel_path);
|
||||||
|
+
|
||||||
|
+ kernel_path = grub_xasprintf("%s", argv[0]);
|
||||||
|
+
|
||||||
|
+ if ( boot_cmdline != NULL ) {
|
||||||
|
+ grub_free(boot_cmdline);
|
||||||
|
+ boot_cmdline = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( argc > 1 )
|
||||||
|
+ {
|
||||||
|
+ boot_cmdline = grub_xasprintf("--command-line=%s", argv[1]);
|
||||||
|
+ for ( i = 2; i < argc; i++ ) {
|
||||||
|
+ tempstr = grub_xasprintf("%s %s", boot_cmdline, argv[i]);
|
||||||
|
+ grub_free(boot_cmdline);
|
||||||
|
+ boot_cmdline = tempstr;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_loader_set (grub_linux_boot, grub_linux_unload, 0);
|
||||||
|
+
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_err_t
|
||||||
|
+grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[])
|
||||||
|
+{
|
||||||
|
+ if (argc == 0)
|
||||||
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
||||||
|
+
|
||||||
|
+ if ( !grub_util_is_regular(argv[0]) )
|
||||||
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find initrd file %s"), argv[0]);
|
||||||
|
+
|
||||||
|
+ if ( initrd_path != NULL )
|
||||||
|
+ grub_free(initrd_path);
|
||||||
|
+
|
||||||
|
+ initrd_path = grub_xasprintf("%s", argv[0]);
|
||||||
|
+
|
||||||
|
+ grub_dl_unref (my_mod);
|
||||||
|
+
|
||||||
|
+ return GRUB_ERR_NONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_command_t cmd_linux, cmd_initrd;
|
||||||
|
+
|
||||||
|
+GRUB_MOD_INIT(linux)
|
||||||
|
+{
|
||||||
|
+ cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, N_("Load Linux."));
|
||||||
|
+ cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, N_("Load initrd."));
|
||||||
|
+ my_mod = mod;
|
||||||
|
+ kernel_path = NULL;
|
||||||
|
+ initrd_path = NULL;
|
||||||
|
+ boot_cmdline = NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+GRUB_MOD_FINI(linux)
|
||||||
|
+{
|
||||||
|
+ grub_unregister_command (cmd_linux);
|
||||||
|
+ grub_unregister_command (cmd_initrd);
|
||||||
|
+}
|
||||||
|
diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h
|
||||||
|
index d1073ef86af..1b61b4a2e5d 100644
|
||||||
|
--- a/include/grub/emu/exec.h
|
||||||
|
+++ b/include/grub/emu/exec.h
|
||||||
|
@@ -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);
|
||||||
|
diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h
|
||||||
|
index cfb1e2b5661..a61568e36e9 100644
|
||||||
|
--- a/include/grub/emu/hostfile.h
|
||||||
|
+++ b/include/grub/emu/hostfile.h
|
||||||
|
@@ -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, ...);
|
||||||
|
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
|
||||||
|
index ff9c48a6490..01056954b96 100644
|
||||||
|
--- a/include/grub/emu/misc.h
|
||||||
|
+++ b/include/grub/emu/misc.h
|
||||||
|
@@ -57,6 +57,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
|
||||||
|
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
|
||||||
|
index ee88e44e97a..80e7a83edf9 100644
|
||||||
|
--- a/grub-core/Makefile.am
|
||||||
|
+++ b/grub-core/Makefile.am
|
||||||
|
@@ -307,6 +307,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
|
||||||
@ -0,0 +1,410 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 15 Mar 2018 14:12:40 -0400
|
||||||
|
Subject: [PATCH] Add grub2-switch-to-blscfg
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
[jhlavac: Use ${etcdefaultgrub} instead of /etc/default/grub]
|
||||||
|
Signed-off-by: Jan Hlavac <jhlavac@redhat.com>
|
||||||
|
---
|
||||||
|
Makefile.util.def | 7 +
|
||||||
|
util/grub-set-password.in | 2 +-
|
||||||
|
util/grub-switch-to-blscfg.8 | 33 +++++
|
||||||
|
util/grub-switch-to-blscfg.in | 317 ++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
4 files changed, 358 insertions(+), 1 deletion(-)
|
||||||
|
create mode 100644 util/grub-switch-to-blscfg.8
|
||||||
|
create mode 100644 util/grub-switch-to-blscfg.in
|
||||||
|
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index cdd2f51fe4b..afc4d7b0c3e 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -1364,6 +1364,13 @@ program = {
|
||||||
|
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
|
||||||
|
};
|
||||||
|
|
||||||
|
+script = {
|
||||||
|
+ name = grub-switch-to-blscfg;
|
||||||
|
+ common = util/grub-switch-to-blscfg.in;
|
||||||
|
+ mansection = 8;
|
||||||
|
+ installdir = sbin;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
program = {
|
||||||
|
name = grub-glue-efi;
|
||||||
|
mansection = 1;
|
||||||
|
diff --git a/util/grub-set-password.in b/util/grub-set-password.in
|
||||||
|
index 5ebf50576d6..c0b5ebbfdc5 100644
|
||||||
|
--- a/util/grub-set-password.in
|
||||||
|
+++ b/util/grub-set-password.in
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
-EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
|
||||||
|
+EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
|
||||||
|
if [ -d /sys/firmware/efi/efivars/ ]; then
|
||||||
|
grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
|
||||||
|
else
|
||||||
|
diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..9a886282976
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-switch-to-blscfg.8
|
||||||
|
@@ -0,0 +1,33 @@
|
||||||
|
+.TH GRUB-SWITCH-TO-BLSCFG 1 "Wed Feb 26 2014"
|
||||||
|
+.SH NAME
|
||||||
|
+\fBgrub-switch-to-blscfg\fR \(em Switch to using BLS config files.
|
||||||
|
+
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+\fBgrub-switch-to-blscfg\fR [--grub-directory=\fIDIR\fR] [--config-file=\fIFILE\fR] [--grub-defaults=\fIFILE\fR]
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+\fBgrub-switch-to-blscfg\fR reconfigures grub-mkconfig to use BLS-style config files, and then regenerates the GRUB configuration.
|
||||||
|
+
|
||||||
|
+.SH OPTIONS
|
||||||
|
+.TP
|
||||||
|
+--grub-directory=\fIDIR\fR
|
||||||
|
+Search for grub.cfg under \fIDIR\fR. The default value is \fI/boot/efi/EFI/\fBVENDOR\fR on UEFI machines and \fI/boot/grub2\fR elsewhere.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--config-file=\fIFILE\fR
|
||||||
|
+The grub config file to use. The default value is \fI/etc/grub2-efi.cfg\fR on UEFI machines and \fI/etc/grub2.cfg\fR elsewhere. Symbolic links will be followed.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--grub-defaults=\fIFILE\fR
|
||||||
|
+The defaults file for grub-mkconfig. The default value is \fI/etc/default/grub\fR.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--bls-directory=\fIDIR\fR
|
||||||
|
+Create BootLoaderSpec fragments in \fIDIR\fR. The default value is \fI/boot/loader/entries\fR.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+--backup-suffix=\fSUFFIX\fR
|
||||||
|
+The suffix to use for saved backup files. The default value is \fI.bak\fR.
|
||||||
|
+
|
||||||
|
+.SH SEE ALSO
|
||||||
|
+.BR "info grub"
|
||||||
|
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..a851424beb2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub-switch-to-blscfg.in
|
||||||
|
@@ -0,0 +1,317 @@
|
||||||
|
+#! /bin/sh
|
||||||
|
+#
|
||||||
|
+# Set a default boot entry for GRUB.
|
||||||
|
+# Copyright (C) 2004,2009 Free Software Foundation, Inc.
|
||||||
|
+#
|
||||||
|
+# GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+# it under the terms of the GNU General Public License as published by
|
||||||
|
+# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+# (at your option) any later version.
|
||||||
|
+#
|
||||||
|
+# GRUB 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 General Public License for more details.
|
||||||
|
+#
|
||||||
|
+# You should have received a copy of the GNU General Public License
|
||||||
|
+# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+
|
||||||
|
+#set -eu
|
||||||
|
+
|
||||||
|
+# Initialize some variables.
|
||||||
|
+prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
+sbindir=@sbindir@
|
||||||
|
+bindir=@bindir@
|
||||||
|
+sysconfdir="@sysconfdir@"
|
||||||
|
+PACKAGE_NAME=@PACKAGE_NAME@
|
||||||
|
+PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||||
|
+datarootdir="@datarootdir@"
|
||||||
|
+datadir="@datadir@"
|
||||||
|
+if [ ! -v pkgdatadir ]; then
|
||||||
|
+ pkgdatadir="${datadir}/@PACKAGE@"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+self=`basename $0`
|
||||||
|
+
|
||||||
|
+grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
|
||||||
|
+grub_editenv=${bindir}/@grub_editenv@
|
||||||
|
+etcdefaultgrub=/etc/default/grub
|
||||||
|
+
|
||||||
|
+eval "$("${grub_get_kernel_settings}")" || true
|
||||||
|
+
|
||||||
|
+EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
|
||||||
|
+if [ -d /sys/firmware/efi/efivars/ ]; then
|
||||||
|
+ startlink=/etc/grub2-efi.cfg
|
||||||
|
+ grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
|
||||||
|
+else
|
||||||
|
+ startlink=/etc/grub2.cfg
|
||||||
|
+ grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+blsdir=`echo "/@bootdirname@/loader/entries" | sed 's,//*,/,g'`
|
||||||
|
+
|
||||||
|
+backupsuffix=.bak
|
||||||
|
+
|
||||||
|
+arch="$(uname -m)"
|
||||||
|
+
|
||||||
|
+export TEXTDOMAIN=@PACKAGE@
|
||||||
|
+export TEXTDOMAINDIR="@localedir@"
|
||||||
|
+
|
||||||
|
+. "${pkgdatadir}/grub-mkconfig_lib"
|
||||||
|
+
|
||||||
|
+# Usage: usage
|
||||||
|
+# Print the usage.
|
||||||
|
+usage () {
|
||||||
|
+ gettext_printf "Usage: %s\n" "$self"
|
||||||
|
+ gettext "Switch to BLS config files.\n"; echo
|
||||||
|
+ echo
|
||||||
|
+ print_option_help "-h, --help" "$(gettext "print this message and exit")"
|
||||||
|
+ print_option_help "-V, --version" "$(gettext "print the version information and exit")"
|
||||||
|
+ echo
|
||||||
|
+ print_option_help "--backup-suffix=$(gettext "SUFFIX")" "$backupsuffix"
|
||||||
|
+ print_option_help "--bls-directory=$(gettext "DIR")" "$blsdir"
|
||||||
|
+ print_option_help "--config-file=$(gettext "FILE")" "$startlink"
|
||||||
|
+ print_option_help "--grub-defaults=$(gettext "FILE")" "$etcdefaultgrub"
|
||||||
|
+ print_option_help "--grub-directory=$(gettext "DIR")" "$grubdir"
|
||||||
|
+ # echo
|
||||||
|
+ # gettext "Report bugs to <bug-grub@gnu.org>."; echo
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+argument () {
|
||||||
|
+ opt=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ if test $# -eq 0; then
|
||||||
|
+ gettext_printf "%s: option requires an argument -- \`%s'\n" "$self" "$opt" 1>&2
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+ echo $1
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# Check the arguments.
|
||||||
|
+while test $# -gt 0
|
||||||
|
+do
|
||||||
|
+ option=$1
|
||||||
|
+ shift
|
||||||
|
+
|
||||||
|
+ case "$option" in
|
||||||
|
+ -h | --help)
|
||||||
|
+ usage
|
||||||
|
+ exit 0 ;;
|
||||||
|
+ -V | --version)
|
||||||
|
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
|
||||||
|
+ exit 0 ;;
|
||||||
|
+
|
||||||
|
+ --backup-suffix)
|
||||||
|
+ backupsuffix=`argument $option "$@"`
|
||||||
|
+ shift
|
||||||
|
+ ;;
|
||||||
|
+ --backup-suffix=*)
|
||||||
|
+ backupsuffix=`echo "$option" | sed 's/--backup-suffix=//'`
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ --bls-directory)
|
||||||
|
+ blsdir=`argument $option "$@"`
|
||||||
|
+ shift
|
||||||
|
+ ;;
|
||||||
|
+ --bls-directory=*)
|
||||||
|
+ blsdir=`echo "$option" | sed 's/--bls-directory=//'`
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ --config-file)
|
||||||
|
+ startlink=`argument $option "$@"`
|
||||||
|
+ shift
|
||||||
|
+ ;;
|
||||||
|
+ --config-file=*)
|
||||||
|
+ startlink=`echo "$option" | sed 's/--config-file=//'`
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ --grub-defaults)
|
||||||
|
+ etcdefaultgrub=`argument $option "$@"`
|
||||||
|
+ shift
|
||||||
|
+ ;;
|
||||||
|
+ --grub-defaults=*)
|
||||||
|
+ etcdefaultgrub=`echo "$option" | sed 's/--grub-defaults=//'`
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ --grub-directory)
|
||||||
|
+ grubdir=`argument $option "$@"`
|
||||||
|
+ shift
|
||||||
|
+ ;;
|
||||||
|
+ --grub-directory=*)
|
||||||
|
+ grubdir=`echo "$option" | sed 's/--grub-directory=//'`
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ *)
|
||||||
|
+ gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
|
||||||
|
+ usage
|
||||||
|
+ exit 1
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
+find_grub_cfg() {
|
||||||
|
+ local candidate=""
|
||||||
|
+ while [ -e "${candidate}" -o $# -gt 0 ]
|
||||||
|
+ do
|
||||||
|
+ if [ ! -e "${candidate}" ] ; then
|
||||||
|
+ candidate="$1"
|
||||||
|
+ shift
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -L "${candidate}" ]; then
|
||||||
|
+ candidate="$(realpath "${candidate}")"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -f "${candidate}" ]; then
|
||||||
|
+ export GRUB_CONFIG_FILE="${candidate}"
|
||||||
|
+ return 0
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+ return 1
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+if ! find_grub_cfg ${startlink} ${grubdir}/grub.cfg ; then
|
||||||
|
+ gettext_printf "Couldn't find config file\n" 1>&2
|
||||||
|
+ exit 1
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ ! -d "${blsdir}" ]; then
|
||||||
|
+ install -m 700 -d "${blsdir}"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ -f /etc/machine-id ]; then
|
||||||
|
+ MACHINE_ID=$(cat /etc/machine-id)
|
||||||
|
+else
|
||||||
|
+ MACHINE_ID=$(dmesg | sha256sum)
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+mkbls() {
|
||||||
|
+ local kernelver=$1 && shift
|
||||||
|
+ local datetime=$1 && shift
|
||||||
|
+ local kernelopts=$1 && shift
|
||||||
|
+
|
||||||
|
+ local debugname=""
|
||||||
|
+ local debugid=""
|
||||||
|
+ local flavor=""
|
||||||
|
+
|
||||||
|
+ if [ "$kernelver" == *\+* ] ; then
|
||||||
|
+ local flavor=-"${kernelver##*+}"
|
||||||
|
+ if [ "${flavor}" == "-debug" ]; then
|
||||||
|
+ local debugname=" with debugging"
|
||||||
|
+ local debugid="-debug"
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+ (
|
||||||
|
+ source /etc/os-release
|
||||||
|
+
|
||||||
|
+ cat <<EOF
|
||||||
|
+title ${NAME} (${kernelver}) ${VERSION}${debugname}
|
||||||
|
+version ${kernelver}${debugid}
|
||||||
|
+linux /vmlinuz-${kernelver}
|
||||||
|
+initrd /initramfs-${kernelver}.img
|
||||||
|
+options ${kernelopts}
|
||||||
|
+grub_users \$grub_users
|
||||||
|
+grub_arg --unrestricted
|
||||||
|
+grub_class kernel${flavor}
|
||||||
|
+EOF
|
||||||
|
+ ) | cat
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+copy_bls() {
|
||||||
|
+ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do
|
||||||
|
+ bls_target="${blsdir}/${MACHINE_ID}-${kernelver}.conf"
|
||||||
|
+ linux="/vmlinuz-${kernelver}"
|
||||||
|
+ linux_path="/boot${linux}"
|
||||||
|
+ kernel_dir="/lib/modules/${kernelver}"
|
||||||
|
+
|
||||||
|
+ if [ ! -d "${kernel_dir}" ] ; then
|
||||||
|
+ continue
|
||||||
|
+ fi
|
||||||
|
+ if [ ! -f "${linux_path}" ]; then
|
||||||
|
+ continue
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ linux_relpath="$("${grub_mkrelpath}" "${linux_path}")"
|
||||||
|
+ bootprefix="${linux_relpath%%"${linux}"}"
|
||||||
|
+ cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||||
|
+
|
||||||
|
+ mkbls "${kernelver}" \
|
||||||
|
+ "$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${kernel_dir}")")" \
|
||||||
|
+ "${bootprefix}" "${cmdline}" >"${bls_target}"
|
||||||
|
+
|
||||||
|
+ if [ "x$GRUB_LINUX_MAKE_DEBUG" = "xtrue" ]; then
|
||||||
|
+ bls_debug="$(echo ${bls_target} | sed -e "s/${kernelver}/${kernelver}~debug/")"
|
||||||
|
+ cp -aT "${bls_target}" "${bls_debug}"
|
||||||
|
+ title="$(grep '^title[ \t]' "${bls_debug}" | sed -e 's/^title[ \t]*//')"
|
||||||
|
+ options="$(echo "${cmdline} ${GRUB_CMDLINE_LINUX_DEBUG}" | sed -e 's/\//\\\//g')"
|
||||||
|
+ sed -i -e "s/^title.*/title ${title}${GRUB_LINUX_DEBUG_TITLE_POSTFIX}/" "${bls_debug}"
|
||||||
|
+ sed -i -e "s/^options.*/options ${options}/" "${bls_debug}"
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
+ if [ -f "/boot/vmlinuz-0-rescue-${MACHINE_ID}" ]; then
|
||||||
|
+ mkbls "0-rescue-${MACHINE_ID}" "0" "${bootprefix}" >"${blsdir}/${MACHINE_ID}-0-rescue.conf"
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# The grub2 EFI binary is not copied to the ESP as a part of an ostree
|
||||||
|
+# transaction. Make sure a grub2 version with BLS support is installed
|
||||||
|
+# but only do this if the blsdir is not set, to make sure that the BLS
|
||||||
|
+# parsing module will search for the BLS snippets in the default path.
|
||||||
|
+if test -f /run/ostree-booted && test -d /sys/firmware/efi/efivars && \
|
||||||
|
+ ! ${grub_editenv} - list | grep -q blsdir && \
|
||||||
|
+ mountpoint -q /boot; then
|
||||||
|
+ grub_binary="$(find /usr/lib/ostree-boot/efi/EFI/${EFIDIR}/ -name grub*.efi)"
|
||||||
|
+ install -m 700 ${grub_binary} ${grubdir} || exit 1
|
||||||
|
+ # Create a hidden file to indicate that grub2 now has BLS support.
|
||||||
|
+ touch /boot/grub2/.grub2-blscfg-supported
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+GENERATE=0
|
||||||
|
+if grep '^GRUB_ENABLE_BLSCFG=.*' "${etcdefaultgrub}" \
|
||||||
|
+ | grep -vq '^GRUB_ENABLE_BLSCFG="*true"*\s*$' ; then
|
||||||
|
+ if ! sed -i"${backupsuffix}" \
|
||||||
|
+ -e 's,^GRUB_ENABLE_BLSCFG=.*,GRUB_ENABLE_BLSCFG=true,' \
|
||||||
|
+ "${etcdefaultgrub}" ; then
|
||||||
|
+ gettext_printf "Updating %s failed\n" "${etcdefaultgrub}"
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+ GENERATE=1
|
||||||
|
+elif ! grep -q '^GRUB_ENABLE_BLSCFG=.*' "${etcdefaultgrub}" ; then
|
||||||
|
+ if ! echo 'GRUB_ENABLE_BLSCFG=true' >> "${etcdefaultgrub}" ; then
|
||||||
|
+ gettext_printf "Updating %s failed\n" "${etcdefaultgrub}"
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+ GENERATE=1
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if [ "${GENERATE}" -eq 1 ] ; then
|
||||||
|
+ copy_bls
|
||||||
|
+
|
||||||
|
+ if [ $arch = "x86_64" ] && [ ! -d /sys/firmware/efi ]; then
|
||||||
|
+ mod_dir="i386-pc"
|
||||||
|
+ elif [ $arch = "ppc64" -o $arch = "ppc64le" ] && [ ! -d /sys/firmware/opal ]; then
|
||||||
|
+ mod_dir="powerpc-ieee1275"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [ -n "${mod_dir}" ]; then
|
||||||
|
+ for mod in blscfg increment; do
|
||||||
|
+ install -m 700 ${prefix}/lib/grub/${mod_dir}/${mod}.mod ${grubdir}/$mod_dir/ || exit 1
|
||||||
|
+ done
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ cp -af "${GRUB_CONFIG_FILE}" "${GRUB_CONFIG_FILE}${backupsuffix}"
|
||||||
|
+ if ! grub2-mkconfig -o "${GRUB_CONFIG_FILE}" ; then
|
||||||
|
+ install -m 700 "${GRUB_CONFIG_FILE}${backupsuffix}" "${GRUB_CONFIG_FILE}"
|
||||||
|
+ sed -i"${backupsuffix}" \
|
||||||
|
+ -e 's,^GRUB_ENABLE_BLSCFG=.*,GRUB_ENABLE_BLSCFG=false,' \
|
||||||
|
+ "${etcdefaultgrub}"
|
||||||
|
+ gettext_printf "Updating %s failed\n" "${GRUB_CONFIG_FILE}"
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+# Bye.
|
||||||
|
+exit 0
|
||||||
@ -0,0 +1,910 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Tue, 9 Jul 2019 17:05:03 +0200
|
||||||
|
Subject: [PATCH] make better backtraces
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
Makefile.util.def | 6 ++
|
||||||
|
grub-core/Makefile.core.def | 16 ++--
|
||||||
|
grub-core/{lib => commands}/backtrace.c | 2 +-
|
||||||
|
grub-core/gdb/cstub.c | 1 -
|
||||||
|
grub-core/kern/arm64/backtrace.c | 94 ++++++++++++++++++++++++
|
||||||
|
grub-core/kern/backtrace.c | 97 +++++++++++++++++++++++++
|
||||||
|
grub-core/kern/dl.c | 45 ++++++++++++
|
||||||
|
grub-core/kern/i386/backtrace.c | 125 ++++++++++++++++++++++++++++++++
|
||||||
|
grub-core/kern/i386/pc/init.c | 4 +-
|
||||||
|
grub-core/kern/ieee1275/init.c | 1 -
|
||||||
|
grub-core/kern/misc.c | 13 ++--
|
||||||
|
grub-core/kern/mm.c | 6 +-
|
||||||
|
grub-core/lib/arm64/backtrace.c | 62 ----------------
|
||||||
|
grub-core/lib/i386/backtrace.c | 78 --------------------
|
||||||
|
include/grub/backtrace.h | 10 ++-
|
||||||
|
include/grub/dl.h | 2 +
|
||||||
|
include/grub/kernel.h | 3 +
|
||||||
|
grub-core/kern/arm/efi/startup.S | 2 +
|
||||||
|
grub-core/kern/arm/startup.S | 2 +
|
||||||
|
grub-core/kern/arm64/efi/startup.S | 2 +
|
||||||
|
grub-core/kern/i386/qemu/startup.S | 3 +-
|
||||||
|
grub-core/kern/ia64/efi/startup.S | 3 +-
|
||||||
|
grub-core/kern/sparc64/ieee1275/crt0.S | 3 +-
|
||||||
|
grub-core/Makefile.am | 1 +
|
||||||
|
24 files changed, 414 insertions(+), 167 deletions(-)
|
||||||
|
rename grub-core/{lib => commands}/backtrace.c (98%)
|
||||||
|
create mode 100644 grub-core/kern/arm64/backtrace.c
|
||||||
|
create mode 100644 grub-core/kern/backtrace.c
|
||||||
|
create mode 100644 grub-core/kern/i386/backtrace.c
|
||||||
|
delete mode 100644 grub-core/lib/arm64/backtrace.c
|
||||||
|
delete mode 100644 grub-core/lib/i386/backtrace.c
|
||||||
|
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index afc4d7b0c3e..41906486a71 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -51,6 +51,12 @@ library = {
|
||||||
|
common = grub-core/partmap/msdos.c;
|
||||||
|
common = grub-core/fs/proc.c;
|
||||||
|
common = grub-core/fs/archelp.c;
|
||||||
|
+ common = grub-core/kern/backtrace.c;
|
||||||
|
+
|
||||||
|
+ x86 = grub-core/kern/i386/backtrace.c;
|
||||||
|
+ i386_xen = grub-core/kern/i386/backtrace.c;
|
||||||
|
+ x86_64_xen = grub-core/kern/i386/backtrace.c;
|
||||||
|
+ arm64 = grub-core/kern/arm64/backtrace.c;
|
||||||
|
};
|
||||||
|
|
||||||
|
library = {
|
||||||
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
||||||
|
index 5354f9613d3..4b7c45a7b06 100644
|
||||||
|
--- a/grub-core/Makefile.core.def
|
||||||
|
+++ b/grub-core/Makefile.core.def
|
||||||
|
@@ -142,6 +142,12 @@ kernel = {
|
||||||
|
common = kern/rescue_reader.c;
|
||||||
|
common = kern/term.c;
|
||||||
|
common = kern/verifiers.c;
|
||||||
|
+ common = kern/backtrace.c;
|
||||||
|
+
|
||||||
|
+ x86 = kern/i386/backtrace.c;
|
||||||
|
+ i386_xen = kern/i386/backtrace.c;
|
||||||
|
+ x86_64_xen = kern/i386/backtrace.c;
|
||||||
|
+ arm64 = kern/arm64/backtrace.c;
|
||||||
|
|
||||||
|
noemu = kern/compiler-rt.c;
|
||||||
|
noemu = kern/mm.c;
|
||||||
|
@@ -188,9 +194,6 @@ kernel = {
|
||||||
|
|
||||||
|
softdiv = lib/division.c;
|
||||||
|
|
||||||
|
- x86 = lib/i386/backtrace.c;
|
||||||
|
- x86 = lib/backtrace.c;
|
||||||
|
-
|
||||||
|
i386 = kern/i386/dl.c;
|
||||||
|
i386_xen = kern/i386/dl.c;
|
||||||
|
i386_xen_pvh = kern/i386/dl.c;
|
||||||
|
@@ -2398,15 +2401,12 @@ module = {
|
||||||
|
|
||||||
|
module = {
|
||||||
|
name = backtrace;
|
||||||
|
- x86 = lib/i386/backtrace.c;
|
||||||
|
- i386_xen_pvh = lib/i386/backtrace.c;
|
||||||
|
- i386_xen = lib/i386/backtrace.c;
|
||||||
|
- x86_64_xen = lib/i386/backtrace.c;
|
||||||
|
- common = lib/backtrace.c;
|
||||||
|
+ common = commands/backtrace.c;
|
||||||
|
enable = x86;
|
||||||
|
enable = i386_xen_pvh;
|
||||||
|
enable = i386_xen;
|
||||||
|
enable = x86_64_xen;
|
||||||
|
+ enable = arm64;
|
||||||
|
};
|
||||||
|
|
||||||
|
module = {
|
||||||
|
diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c
|
||||||
|
similarity index 98%
|
||||||
|
rename from grub-core/lib/backtrace.c
|
||||||
|
rename to grub-core/commands/backtrace.c
|
||||||
|
index c0ad6ab8be1..8b5ec3913b5 100644
|
||||||
|
--- a/grub-core/lib/backtrace.c
|
||||||
|
+++ b/grub-core/commands/backtrace.c
|
||||||
|
@@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
|
||||||
|
int argc __attribute__ ((unused)),
|
||||||
|
char **args __attribute__ ((unused)))
|
||||||
|
{
|
||||||
|
- grub_backtrace ();
|
||||||
|
+ grub_backtrace (1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
|
||||||
|
index b64acd70fee..99281472d36 100644
|
||||||
|
--- a/grub-core/gdb/cstub.c
|
||||||
|
+++ b/grub-core/gdb/cstub.c
|
||||||
|
@@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no)
|
||||||
|
grub_printf ("Unhandled exception 0x%x at ", trap_no);
|
||||||
|
grub_backtrace_print_address ((void *) grub_gdb_regs[PC]);
|
||||||
|
grub_printf ("\n");
|
||||||
|
- grub_backtrace_pointer ((void *) grub_gdb_regs[EBP]);
|
||||||
|
grub_fatal ("Unhandled exception");
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..019c6fdfef2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/kern/arm64/backtrace.c
|
||||||
|
@@ -0,0 +1,94 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <grub/misc.h>
|
||||||
|
+#include <grub/command.h>
|
||||||
|
+#include <grub/err.h>
|
||||||
|
+#include <grub/dl.h>
|
||||||
|
+#include <grub/mm.h>
|
||||||
|
+#include <grub/term.h>
|
||||||
|
+#include <grub/backtrace.h>
|
||||||
|
+
|
||||||
|
+#define MAX_STACK_FRAME 102400
|
||||||
|
+
|
||||||
|
+struct fplr
|
||||||
|
+{
|
||||||
|
+ void *lr;
|
||||||
|
+ struct fplr *fp;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_pointer (void *frame, unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ unsigned int x = 0;
|
||||||
|
+ struct fplr *fplr = (struct fplr *)frame;
|
||||||
|
+
|
||||||
|
+ while (fplr)
|
||||||
|
+ {
|
||||||
|
+ const char *name = NULL;
|
||||||
|
+ char *addr = NULL;
|
||||||
|
+
|
||||||
|
+ grub_dprintf("backtrace", "fp is %p next_fp is %p\n",
|
||||||
|
+ fplr, fplr->fp);
|
||||||
|
+
|
||||||
|
+ if (x >= skip)
|
||||||
|
+ {
|
||||||
|
+ name = grub_get_symbol_by_addr (fplr->lr, 1);
|
||||||
|
+ if (name)
|
||||||
|
+ addr = grub_resolve_symbol (name);
|
||||||
|
+ grub_backtrace_print_address (fplr->lr);
|
||||||
|
+
|
||||||
|
+ if (addr && addr != fplr->lr)
|
||||||
|
+ grub_printf (" %s() %p+%p \n", name ? name : "unknown", addr,
|
||||||
|
+ (void *)((grub_uint64_t)fplr->lr - (grub_uint64_t)addr));
|
||||||
|
+ else
|
||||||
|
+ grub_printf(" %s() %p \n", name ? name : "unknown", addr);
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ x += 1;
|
||||||
|
+
|
||||||
|
+ if (fplr->fp < fplr ||
|
||||||
|
+ (grub_uint64_t)fplr->fp - (grub_uint64_t)fplr > MAX_STACK_FRAME ||
|
||||||
|
+ fplr->fp == fplr)
|
||||||
|
+ {
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ fplr = fplr->fp;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+asm ("\t.global \"_text\"\n"
|
||||||
|
+ "_text:\n"
|
||||||
|
+ "\t.quad .text\n"
|
||||||
|
+ "\t.global \"_data\"\n"
|
||||||
|
+ "_data:\n"
|
||||||
|
+ "\t.quad .data\n"
|
||||||
|
+ );
|
||||||
|
+
|
||||||
|
+extern grub_uint64_t _text;
|
||||||
|
+extern grub_uint64_t _data;
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_arch (unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ grub_printf ("Backtrace (.text %p .data %p):\n",
|
||||||
|
+ (void *)_text, (void *)_data);
|
||||||
|
+ skip += 1;
|
||||||
|
+ grub_backtrace_pointer(__builtin_frame_address(0), skip);
|
||||||
|
+}
|
||||||
|
diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..4a82e865cc6
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/kern/backtrace.c
|
||||||
|
@@ -0,0 +1,97 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <grub/misc.h>
|
||||||
|
+#include <grub/command.h>
|
||||||
|
+#include <grub/err.h>
|
||||||
|
+#include <grub/dl.h>
|
||||||
|
+#include <grub/mm.h>
|
||||||
|
+#include <grub/term.h>
|
||||||
|
+#include <grub/backtrace.h>
|
||||||
|
+
|
||||||
|
+GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+grub_backtrace_print_address_default (void *addr)
|
||||||
|
+{
|
||||||
|
+#ifndef GRUB_UTIL
|
||||||
|
+ grub_dl_t mod;
|
||||||
|
+ void *start_addr;
|
||||||
|
+
|
||||||
|
+ FOR_DL_MODULES (mod)
|
||||||
|
+ {
|
||||||
|
+ grub_dl_segment_t segment;
|
||||||
|
+ for (segment = mod->segment; segment; segment = segment->next)
|
||||||
|
+ if (segment->addr <= addr && (grub_uint8_t *) segment->addr
|
||||||
|
+ + segment->size > (grub_uint8_t *) addr)
|
||||||
|
+ {
|
||||||
|
+ grub_printf ("%s.%x+%" PRIxGRUB_SIZE, mod->name,
|
||||||
|
+ segment->section,
|
||||||
|
+ (grub_size_t)
|
||||||
|
+ ((grub_uint8_t *)addr - (grub_uint8_t *)segment->addr));
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ start_addr = grub_resolve_symbol ("_start");
|
||||||
|
+ if (start_addr && start_addr < addr)
|
||||||
|
+ grub_printf ("kernel+%" PRIxGRUB_SIZE,
|
||||||
|
+ (grub_size_t)
|
||||||
|
+ ((grub_uint8_t *)addr - (grub_uint8_t *)start_addr));
|
||||||
|
+ else
|
||||||
|
+#endif
|
||||||
|
+ grub_printf ("%p", addr);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+grub_backtrace_pointer_default (void *frame __attribute__((__unused__)),
|
||||||
|
+ unsigned int skip __attribute__((__unused__)))
|
||||||
|
+{
|
||||||
|
+ return;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_pointer (void *frame, unsigned int skip)
|
||||||
|
+ __attribute__((__weak__,
|
||||||
|
+ __alias__(("grub_backtrace_pointer_default"))));
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_print_address (void *addr)
|
||||||
|
+ __attribute__((__weak__,
|
||||||
|
+ __alias__(("grub_backtrace_print_address_default"))));
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+grub_backtrace_arch_default(unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ grub_backtrace_pointer(__builtin_frame_address(0), skip + 1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void grub_backtrace_arch (unsigned int skip)
|
||||||
|
+ __attribute__((__weak__, __alias__(("grub_backtrace_arch_default"))));
|
||||||
|
+
|
||||||
|
+void grub_backtrace (unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ grub_backtrace_arch(skip + 1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void grub_debug_backtrace (const char * const debug,
|
||||||
|
+ unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ if (grub_debug_enabled (debug))
|
||||||
|
+ grub_backtrace (skip + 1);
|
||||||
|
+}
|
||||||
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
||||||
|
index 7afb9e6f724..88d2077709e 100644
|
||||||
|
--- a/grub-core/kern/dl.c
|
||||||
|
+++ b/grub-core/kern/dl.c
|
||||||
|
@@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void *
|
||||||
|
+grub_resolve_symbol (const char *name)
|
||||||
|
+{
|
||||||
|
+ grub_symbol_t sym;
|
||||||
|
+
|
||||||
|
+ sym = grub_dl_resolve_symbol (name);
|
||||||
|
+ if (sym)
|
||||||
|
+ return sym->addr;
|
||||||
|
+ return NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+const char *
|
||||||
|
+grub_get_symbol_by_addr(const void *addr, int isfunc)
|
||||||
|
+{
|
||||||
|
+ unsigned int i;
|
||||||
|
+ grub_symbol_t before = NULL, after = NULL;
|
||||||
|
+ for (i = 0; i < GRUB_SYMTAB_SIZE; i++)
|
||||||
|
+ {
|
||||||
|
+ grub_symbol_t sym;
|
||||||
|
+ for (sym = grub_symtab[i]; sym; sym = sym->next)
|
||||||
|
+ {
|
||||||
|
+ //grub_printf ("addr 0x%08llx symbol %s\n", (unsigned long long)sym->addr, sym->name);
|
||||||
|
+ if (sym->addr > addr)
|
||||||
|
+ {
|
||||||
|
+ if (!after || sym->addr > after->addr)
|
||||||
|
+ after = sym;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (isfunc != sym->isfunc)
|
||||||
|
+ continue;
|
||||||
|
+ if (sym->addr > addr)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ if ((!before && sym->addr <= addr) || (before && before->addr <= sym->addr))
|
||||||
|
+ before = sym;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (before && addr < after->addr)
|
||||||
|
+ return before->name;
|
||||||
|
+
|
||||||
|
+ return NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* Register a symbol with the name NAME and the address ADDR. */
|
||||||
|
grub_err_t
|
||||||
|
grub_dl_register_symbol (const char *name, void *addr, int isfunc,
|
||||||
|
@@ -336,6 +380,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
|
||||||
|
const char *str;
|
||||||
|
Elf_Word size, entsize;
|
||||||
|
|
||||||
|
+ grub_dprintf ("modules", "Resolving symbols for \"%s\"\n", mod->name);
|
||||||
|
for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
|
||||||
|
i < e->e_shnum;
|
||||||
|
i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
|
||||||
|
diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..2413f9a57db
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/grub-core/kern/i386/backtrace.c
|
||||||
|
@@ -0,0 +1,125 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <grub/misc.h>
|
||||||
|
+#include <grub/command.h>
|
||||||
|
+#include <grub/err.h>
|
||||||
|
+#include <grub/dl.h>
|
||||||
|
+#include <grub/mm.h>
|
||||||
|
+#include <grub/term.h>
|
||||||
|
+#include <grub/backtrace.h>
|
||||||
|
+
|
||||||
|
+#define MAX_STACK_FRAME 102400
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_pointer (void *frame, unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ void **ebp = (void **)frame;
|
||||||
|
+ unsigned long x = 0;
|
||||||
|
+
|
||||||
|
+ while (ebp)
|
||||||
|
+ {
|
||||||
|
+ void **next_ebp = (void **)ebp[0];
|
||||||
|
+ const char *name = NULL;
|
||||||
|
+ char *addr = NULL;
|
||||||
|
+
|
||||||
|
+ grub_dprintf("backtrace", "ebp is %p next_ebp is %p\n", ebp, next_ebp);
|
||||||
|
+
|
||||||
|
+ if (x >= skip)
|
||||||
|
+ {
|
||||||
|
+ name = grub_get_symbol_by_addr (ebp[1], 1);
|
||||||
|
+ if (name)
|
||||||
|
+ addr = grub_resolve_symbol (name);
|
||||||
|
+ grub_backtrace_print_address (ebp[1]);
|
||||||
|
+
|
||||||
|
+ if (addr && addr != ebp[1])
|
||||||
|
+ grub_printf (" %s() %p+%p \n", name ? name : "unknown", addr,
|
||||||
|
+ (char *)((char *)ebp[1] - addr));
|
||||||
|
+ else
|
||||||
|
+ grub_printf(" %s() %p \n", name ? name : "unknown", addr);
|
||||||
|
+
|
||||||
|
+#if 0
|
||||||
|
+ grub_printf ("(");
|
||||||
|
+ for (i = 0, arg = ebp[2]; arg != next_ebp && i < 12; arg++, i++)
|
||||||
|
+ grub_printf ("%p,", arg);
|
||||||
|
+ grub_printf (")\n");
|
||||||
|
+#endif
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ x += 1;
|
||||||
|
+
|
||||||
|
+ if (next_ebp < ebp || next_ebp - ebp > MAX_STACK_FRAME || next_ebp == ebp)
|
||||||
|
+ {
|
||||||
|
+ //grub_printf ("Invalid stack frame at %p (%p)\n", ebp, next_ebp);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ ebp = next_ebp;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#if defined (__x86_64__)
|
||||||
|
+asm ("\t.global \"_text\"\n"
|
||||||
|
+ "_text:\n"
|
||||||
|
+ "\t.quad .text\n"
|
||||||
|
+ "\t.global \"_data\"\n"
|
||||||
|
+ "_data:\n"
|
||||||
|
+ "\t.quad .data\n"
|
||||||
|
+ );
|
||||||
|
+#elif defined(__i386__)
|
||||||
|
+asm ("\t.global \"_text\"\n"
|
||||||
|
+ "_text:\n"
|
||||||
|
+ "\t.long .text\n"
|
||||||
|
+ "\t.global \"_data\"\n"
|
||||||
|
+ "_data:\n"
|
||||||
|
+ "\t.long .data\n"
|
||||||
|
+ );
|
||||||
|
+#else
|
||||||
|
+#warning I dunno...
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+extern unsigned long _text;
|
||||||
|
+extern unsigned long _data;
|
||||||
|
+
|
||||||
|
+#ifdef GRUB_UTIL
|
||||||
|
+#define EXT_C(x) x
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+grub_backtrace_arch (unsigned int skip)
|
||||||
|
+{
|
||||||
|
+ grub_printf ("Backtrace (.text %p .data %p):\n",
|
||||||
|
+ (void *)_text, (void *)_data);
|
||||||
|
+ skip += 1;
|
||||||
|
+#if defined (__x86_64__)
|
||||||
|
+ asm volatile ("movq %%rbp, %%rdi\n"
|
||||||
|
+ "movq 0, %%rsi\n"
|
||||||
|
+ "movl %0, %%esi\n"
|
||||||
|
+ "call " EXT_C("grub_backtrace_pointer")
|
||||||
|
+ :
|
||||||
|
+ : "r" (skip));
|
||||||
|
+#elif defined(__i386__)
|
||||||
|
+ asm volatile ("addl $8, %%esp\n"
|
||||||
|
+ "pushl %0\n"
|
||||||
|
+ "pushl %%ebp\n"
|
||||||
|
+ "call " EXT_C("grub_backtrace_pointer")
|
||||||
|
+ :
|
||||||
|
+ : "r" (skip));
|
||||||
|
+#else
|
||||||
|
+ grub_backtrace_pointer(__builtin_frame_address(0), skip);
|
||||||
|
+#endif
|
||||||
|
+}
|
||||||
|
diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
|
||||||
|
index 27bc68b8a53..b51d0abfa6e 100644
|
||||||
|
--- a/grub-core/kern/i386/pc/init.c
|
||||||
|
+++ b/grub-core/kern/i386/pc/init.c
|
||||||
|
@@ -153,7 +153,7 @@ compact_mem_regions (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
grub_addr_t grub_modbase;
|
||||||
|
-extern grub_uint8_t _start[], _edata[];
|
||||||
|
+extern grub_uint8_t _edata[];
|
||||||
|
|
||||||
|
/* Helper for grub_machine_init. */
|
||||||
|
static int
|
||||||
|
@@ -217,7 +217,7 @@ grub_machine_init (void)
|
||||||
|
/* This has to happen before any BIOS calls. */
|
||||||
|
grub_via_workaround_init ();
|
||||||
|
|
||||||
|
- grub_modbase = GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR + (_edata - _start);
|
||||||
|
+ grub_modbase = GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR + (_edata - (grub_uint8_t *)_start);
|
||||||
|
|
||||||
|
/* Initialize the console as early as possible. */
|
||||||
|
grub_console_init ();
|
||||||
|
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
|
||||||
|
index 0cd2a627231..937c1bc44cb 100644
|
||||||
|
--- a/grub-core/kern/ieee1275/init.c
|
||||||
|
+++ b/grub-core/kern/ieee1275/init.c
|
||||||
|
@@ -63,7 +63,6 @@
|
||||||
|
#define HEAP_MAX_ADDR (unsigned long) (32 * 1024 * 1024)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-extern char _start[];
|
||||||
|
extern char _end[];
|
||||||
|
|
||||||
|
#ifdef __sparc__
|
||||||
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
||||||
|
index c60601b699d..a432a6be54a 100644
|
||||||
|
--- a/grub-core/kern/misc.c
|
||||||
|
+++ b/grub-core/kern/misc.c
|
||||||
|
@@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
|
||||||
|
|
||||||
|
|
||||||
|
/* Abort GRUB. This function does not return. */
|
||||||
|
-static void __attribute__ ((noreturn))
|
||||||
|
+static inline void __attribute__ ((noreturn))
|
||||||
|
grub_abort (void)
|
||||||
|
{
|
||||||
|
-#ifndef GRUB_UTIL
|
||||||
|
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_EMU)
|
||||||
|
- grub_backtrace();
|
||||||
|
+#if !defined(GRUB_MACHINE_EMU) && !defined(GRUB_UTIL)
|
||||||
|
+ grub_backtrace (1);
|
||||||
|
+#else
|
||||||
|
+ grub_printf ("\n");
|
||||||
|
#endif
|
||||||
|
-#endif
|
||||||
|
- grub_printf ("\nAborted.");
|
||||||
|
+ grub_printf ("Aborted.");
|
||||||
|
|
||||||
|
#ifndef GRUB_UTIL
|
||||||
|
if (grub_term_inputs)
|
||||||
|
@@ -1232,6 +1232,7 @@ grub_fatal (const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
+ grub_printf ("\n");
|
||||||
|
va_start (ap, fmt);
|
||||||
|
grub_vprintf (_(fmt), ap);
|
||||||
|
va_end (ap);
|
||||||
|
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
|
||||||
|
index c070afc621f..d8c8377578b 100644
|
||||||
|
--- a/grub-core/kern/mm.c
|
||||||
|
+++ b/grub-core/kern/mm.c
|
||||||
|
@@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (! *r)
|
||||||
|
- grub_fatal ("out of range pointer %p", ptr);
|
||||||
|
+ grub_fatal ("out of range pointer %p\n", ptr);
|
||||||
|
|
||||||
|
*p = (grub_mm_header_t) ptr - 1;
|
||||||
|
if ((*p)->magic == GRUB_MM_FREE_MAGIC)
|
||||||
|
- grub_fatal ("double free at %p", *p);
|
||||||
|
+ grub_fatal ("double free at %p\n", *p);
|
||||||
|
if ((*p)->magic != GRUB_MM_ALLOC_MAGIC)
|
||||||
|
- grub_fatal ("alloc magic is broken at %p: %lx", *p,
|
||||||
|
+ grub_fatal ("alloc magic is broken at %p: %lx\n", *p,
|
||||||
|
(unsigned long) (*p)->magic);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index 1079b5380e1..00000000000
|
||||||
|
--- a/grub-core/lib/arm64/backtrace.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,62 +0,0 @@
|
||||||
|
-/*
|
||||||
|
- * GRUB -- GRand Unified Bootloader
|
||||||
|
- * Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
- *
|
||||||
|
- * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
- * it under the terms of the GNU General Public License as published by
|
||||||
|
- * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
- * (at your option) any later version.
|
||||||
|
- *
|
||||||
|
- * GRUB 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 General Public License for more details.
|
||||||
|
- *
|
||||||
|
- * You should have received a copy of the GNU General Public License
|
||||||
|
- * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
-#include <grub/misc.h>
|
||||||
|
-#include <grub/command.h>
|
||||||
|
-#include <grub/err.h>
|
||||||
|
-#include <grub/dl.h>
|
||||||
|
-#include <grub/mm.h>
|
||||||
|
-#include <grub/term.h>
|
||||||
|
-#include <grub/backtrace.h>
|
||||||
|
-
|
||||||
|
-#define MAX_STACK_FRAME 102400
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
-grub_backtrace_pointer (int frame)
|
||||||
|
-{
|
||||||
|
- while (1)
|
||||||
|
- {
|
||||||
|
- void *lp = __builtin_return_address (frame);
|
||||||
|
- if (!lp)
|
||||||
|
- break;
|
||||||
|
-
|
||||||
|
- lp = __builtin_extract_return_addr (lp);
|
||||||
|
-
|
||||||
|
- grub_printf ("%p: ", lp);
|
||||||
|
- grub_backtrace_print_address (lp);
|
||||||
|
- grub_printf (" (");
|
||||||
|
- for (i = 0; i < 2; i++)
|
||||||
|
- grub_printf ("%p,", ((void **)ptr) [i + 2]);
|
||||||
|
- grub_printf ("%p)\n", ((void **)ptr) [i + 2]);
|
||||||
|
- nptr = *(void **)ptr;
|
||||||
|
- if (nptr < ptr || (void **) nptr - (void **) ptr > MAX_STACK_FRAME
|
||||||
|
- || nptr == ptr)
|
||||||
|
- {
|
||||||
|
- grub_printf ("Invalid stack frame at %p (%p)\n", ptr, nptr);
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- ptr = nptr;
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
-grub_backtrace (void)
|
||||||
|
-{
|
||||||
|
- grub_backtrace_pointer (1);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index c67273db3ae..00000000000
|
||||||
|
--- a/grub-core/lib/i386/backtrace.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,78 +0,0 @@
|
||||||
|
-/*
|
||||||
|
- * GRUB -- GRand Unified Bootloader
|
||||||
|
- * Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
- *
|
||||||
|
- * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
- * it under the terms of the GNU General Public License as published by
|
||||||
|
- * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
- * (at your option) any later version.
|
||||||
|
- *
|
||||||
|
- * GRUB 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 General Public License for more details.
|
||||||
|
- *
|
||||||
|
- * You should have received a copy of the GNU General Public License
|
||||||
|
- * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
- */
|
||||||
|
-#include <config.h>
|
||||||
|
-#ifdef GRUB_UTIL
|
||||||
|
-#define REALLY_GRUB_UTIL GRUB_UTIL
|
||||||
|
-#undef GRUB_UTIL
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-#include <grub/symbol.h>
|
||||||
|
-#include <grub/dl.h>
|
||||||
|
-
|
||||||
|
-#ifdef REALLY_GRUB_UTIL
|
||||||
|
-#define GRUB_UTIL REALLY_GRUB_UTIL
|
||||||
|
-#undef REALLY_GRUB_UTIL
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-#include <grub/misc.h>
|
||||||
|
-#include <grub/command.h>
|
||||||
|
-#include <grub/err.h>
|
||||||
|
-#include <grub/mm.h>
|
||||||
|
-#include <grub/term.h>
|
||||||
|
-#include <grub/backtrace.h>
|
||||||
|
-
|
||||||
|
-#define MAX_STACK_FRAME 102400
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
-grub_backtrace_pointer (void *ebp)
|
||||||
|
-{
|
||||||
|
- void *ptr, *nptr;
|
||||||
|
- unsigned i;
|
||||||
|
-
|
||||||
|
- ptr = ebp;
|
||||||
|
- while (1)
|
||||||
|
- {
|
||||||
|
- grub_printf ("%p: ", ptr);
|
||||||
|
- grub_backtrace_print_address (((void **) ptr)[1]);
|
||||||
|
- grub_printf (" (");
|
||||||
|
- for (i = 0; i < 2; i++)
|
||||||
|
- grub_printf ("%p,", ((void **)ptr) [i + 2]);
|
||||||
|
- grub_printf ("%p)\n", ((void **)ptr) [i + 2]);
|
||||||
|
- nptr = *(void **)ptr;
|
||||||
|
- if (nptr < ptr || (void **) nptr - (void **) ptr > MAX_STACK_FRAME
|
||||||
|
- || nptr == ptr)
|
||||||
|
- {
|
||||||
|
- grub_printf ("Invalid stack frame at %p (%p)\n", ptr, nptr);
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- ptr = nptr;
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
-grub_backtrace (void)
|
||||||
|
-{
|
||||||
|
-#ifdef __x86_64__
|
||||||
|
- asm volatile ("movq %%rbp, %%rdi\n"
|
||||||
|
- "callq *%%rax": :"a"(grub_backtrace_pointer));
|
||||||
|
-#else
|
||||||
|
- asm volatile ("movl %%ebp, %%eax\n"
|
||||||
|
- "calll *%%ecx": :"c"(grub_backtrace_pointer));
|
||||||
|
-#endif
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h
|
||||||
|
index 395519762f0..275cf85e2d3 100644
|
||||||
|
--- a/include/grub/backtrace.h
|
||||||
|
+++ b/include/grub/backtrace.h
|
||||||
|
@@ -19,8 +19,14 @@
|
||||||
|
#ifndef GRUB_BACKTRACE_HEADER
|
||||||
|
#define GRUB_BACKTRACE_HEADER 1
|
||||||
|
|
||||||
|
-void grub_backtrace (void);
|
||||||
|
-void grub_backtrace_pointer (void *ptr);
|
||||||
|
+#include <grub/symbol.h>
|
||||||
|
+#include <grub/types.h>
|
||||||
|
+
|
||||||
|
+void EXPORT_FUNC(grub_debug_backtrace) (const char * const debug,
|
||||||
|
+ unsigned int skip);
|
||||||
|
+void EXPORT_FUNC(grub_backtrace) (unsigned int skip);
|
||||||
|
+void grub_backtrace_arch (unsigned int skip);
|
||||||
|
+void grub_backtrace_pointer (void *ptr, unsigned int skip);
|
||||||
|
void grub_backtrace_print_address (void *addr);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
diff --git a/include/grub/dl.h b/include/grub/dl.h
|
||||||
|
index 91933b85f2c..2f76e6b0437 100644
|
||||||
|
--- a/include/grub/dl.h
|
||||||
|
+++ b/include/grub/dl.h
|
||||||
|
@@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+void * EXPORT_FUNC(grub_resolve_symbol) (const char *name);
|
||||||
|
+const char * EXPORT_FUNC(grub_get_symbol_by_addr) (const void *addr, int isfunc);
|
||||||
|
grub_err_t grub_dl_register_symbol (const char *name, void *addr,
|
||||||
|
int isfunc, grub_dl_t mod);
|
||||||
|
|
||||||
|
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
|
||||||
|
index abbca5ea335..300a9766cda 100644
|
||||||
|
--- a/include/grub/kernel.h
|
||||||
|
+++ b/include/grub/kernel.h
|
||||||
|
@@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+void EXPORT_FUNC(start) (void);
|
||||||
|
+void EXPORT_FUNC(_start) (void);
|
||||||
|
+
|
||||||
|
/* The start point of the C code. */
|
||||||
|
void grub_main (void) __attribute__ ((noreturn));
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
|
||||||
|
index 9f8265315a9..f3bc41f9d0f 100644
|
||||||
|
--- a/grub-core/kern/arm/efi/startup.S
|
||||||
|
+++ b/grub-core/kern/arm/efi/startup.S
|
||||||
|
@@ -23,6 +23,8 @@
|
||||||
|
.file "startup.S"
|
||||||
|
.text
|
||||||
|
.arm
|
||||||
|
+ .globl start, _start
|
||||||
|
+FUNCTION(start)
|
||||||
|
FUNCTION(_start)
|
||||||
|
/*
|
||||||
|
* EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0.
|
||||||
|
diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S
|
||||||
|
index 3946fe8e183..5679a1d00ad 100644
|
||||||
|
--- a/grub-core/kern/arm/startup.S
|
||||||
|
+++ b/grub-core/kern/arm/startup.S
|
||||||
|
@@ -48,6 +48,8 @@
|
||||||
|
|
||||||
|
.text
|
||||||
|
.arm
|
||||||
|
+ .globl start, _start
|
||||||
|
+FUNCTION(start)
|
||||||
|
FUNCTION(_start)
|
||||||
|
b codestart
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S
|
||||||
|
index 666a7ee3c92..41676bdb2b8 100644
|
||||||
|
--- a/grub-core/kern/arm64/efi/startup.S
|
||||||
|
+++ b/grub-core/kern/arm64/efi/startup.S
|
||||||
|
@@ -19,7 +19,9 @@
|
||||||
|
#include <grub/symbol.h>
|
||||||
|
|
||||||
|
.file "startup.S"
|
||||||
|
+ .globl start, _start
|
||||||
|
.text
|
||||||
|
+FUNCTION(start)
|
||||||
|
FUNCTION(_start)
|
||||||
|
/*
|
||||||
|
* EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0.
|
||||||
|
diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
|
||||||
|
index 0d89858d9b3..939f182fc74 100644
|
||||||
|
--- a/grub-core/kern/i386/qemu/startup.S
|
||||||
|
+++ b/grub-core/kern/i386/qemu/startup.S
|
||||||
|
@@ -24,7 +24,8 @@
|
||||||
|
|
||||||
|
.text
|
||||||
|
.code32
|
||||||
|
- .globl _start
|
||||||
|
+ .globl start, _start
|
||||||
|
+start:
|
||||||
|
_start:
|
||||||
|
jmp codestart
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S
|
||||||
|
index d75c6d7cc74..8f2a593e529 100644
|
||||||
|
--- a/grub-core/kern/ia64/efi/startup.S
|
||||||
|
+++ b/grub-core/kern/ia64/efi/startup.S
|
||||||
|
@@ -24,8 +24,9 @@
|
||||||
|
.psr lsb
|
||||||
|
.lsb
|
||||||
|
|
||||||
|
- .global _start
|
||||||
|
+ .global start, _start
|
||||||
|
.proc _start
|
||||||
|
+start:
|
||||||
|
_start:
|
||||||
|
alloc loc0=ar.pfs,2,4,0,0
|
||||||
|
mov loc1=rp
|
||||||
|
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
|
||||||
|
index 03b916f0534..701bf63abcf 100644
|
||||||
|
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
|
||||||
|
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
|
||||||
|
@@ -22,7 +22,8 @@
|
||||||
|
|
||||||
|
.text
|
||||||
|
.align 4
|
||||||
|
- .globl _start
|
||||||
|
+ .globl start, _start
|
||||||
|
+start:
|
||||||
|
_start:
|
||||||
|
ba codestart
|
||||||
|
mov %o4, %o0
|
||||||
|
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
|
||||||
|
index 80e7a83edf9..f512573c0da 100644
|
||||||
|
--- a/grub-core/Makefile.am
|
||||||
|
+++ b/grub-core/Makefile.am
|
||||||
|
@@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h
|
||||||
|
|
||||||
|
include $(srcdir)/Makefile.core.am
|
||||||
|
|
||||||
|
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/backtrace.h
|
||||||
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
|
||||||
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
|
||||||
|
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 9 Nov 2017 15:58:52 -0500
|
||||||
|
Subject: [PATCH] normal: don't draw our startup message if debug is set
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/normal/main.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||||
|
index d5968797f4f..e349303c29b 100644
|
||||||
|
--- a/grub-core/normal/main.c
|
||||||
|
+++ b/grub-core/normal/main.c
|
||||||
|
@@ -432,6 +432,9 @@ grub_normal_reader_init (int nested)
|
||||||
|
const char *msg_esc = _("ESC at any time exits.");
|
||||||
|
char *msg_formatted;
|
||||||
|
|
||||||
|
+ if (grub_env_get ("debug") != NULL)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For "
|
||||||
|
"the first word, TAB lists possible command completions. Anywhere "
|
||||||
|
"else TAB lists possible device or file completions. %s"),
|
||||||
@ -0,0 +1,137 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Fri, 16 Mar 2018 13:28:57 -0400
|
||||||
|
Subject: [PATCH] Work around some minor include path weirdnesses
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
include/grub/arm/efi/console.h | 24 ++++++++++++++++++++++++
|
||||||
|
include/grub/arm64/efi/console.h | 24 ++++++++++++++++++++++++
|
||||||
|
include/grub/i386/efi/console.h | 24 ++++++++++++++++++++++++
|
||||||
|
include/grub/x86_64/efi/console.h | 24 ++++++++++++++++++++++++
|
||||||
|
4 files changed, 96 insertions(+)
|
||||||
|
create mode 100644 include/grub/arm/efi/console.h
|
||||||
|
create mode 100644 include/grub/arm64/efi/console.h
|
||||||
|
create mode 100644 include/grub/i386/efi/console.h
|
||||||
|
create mode 100644 include/grub/x86_64/efi/console.h
|
||||||
|
|
||||||
|
diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..1592f6f76b5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/include/grub/arm/efi/console.h
|
||||||
|
@@ -0,0 +1,24 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2002,2005,2006,2007 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifndef GRUB_ARM_EFI_CONSOLE_H
|
||||||
|
+#define GRUB_ARM_EFI_CONSOLE_H
|
||||||
|
+
|
||||||
|
+#include <efi/console.h>
|
||||||
|
+
|
||||||
|
+#endif /* ! GRUB_ARM_EFI_CONSOLE_H */
|
||||||
|
diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..95689339384
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/include/grub/arm64/efi/console.h
|
||||||
|
@@ -0,0 +1,24 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2002,2005,2006,2007 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifndef GRUB_ARM64_EFI_CONSOLE_H
|
||||||
|
+#define GRUB_ARM64_EFI_CONSOLE_H
|
||||||
|
+
|
||||||
|
+#include <efi/console.h>
|
||||||
|
+
|
||||||
|
+#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */
|
||||||
|
diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..9231375cb07
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/include/grub/i386/efi/console.h
|
||||||
|
@@ -0,0 +1,24 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2002,2005,2006,2007 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifndef GRUB_I386_EFI_CONSOLE_H
|
||||||
|
+#define GRUB_I386_EFI_CONSOLE_H
|
||||||
|
+
|
||||||
|
+#include <efi/console.h>
|
||||||
|
+
|
||||||
|
+#endif /* ! GRUB_I386_EFI_CONSOLE_H */
|
||||||
|
diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..dba9d8678d0
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/include/grub/x86_64/efi/console.h
|
||||||
|
@@ -0,0 +1,24 @@
|
||||||
|
+/*
|
||||||
|
+ * GRUB -- GRand Unified Bootloader
|
||||||
|
+ * Copyright (C) 2002,2005,2006,2007 Free Software Foundation, Inc.
|
||||||
|
+ *
|
||||||
|
+ * GRUB is free software: you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License as published by
|
||||||
|
+ * the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+ * (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * GRUB 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 General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License
|
||||||
|
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifndef GRUB_X86_64_EFI_CONSOLE_H
|
||||||
|
+#define GRUB_X86_64_EFI_CONSOLE_H
|
||||||
|
+
|
||||||
|
+#include <efi/console.h>
|
||||||
|
+
|
||||||
|
+#endif /* ! GRUB_X86_64_EFI_CONSOLE_H */
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 25 Jun 2015 15:41:06 -0400
|
||||||
|
Subject: [PATCH] Make it possible to enabled --build-id=sha1
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
configure.ac | 8 ++++++++
|
||||||
|
acinclude.m4 | 19 +++++++++++++++++++
|
||||||
|
2 files changed, 27 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 537ed411469..b4455e4732d 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC
|
||||||
|
if test "x$TARGET_APPLE_LINKER" != x1 ; then
|
||||||
|
grub_PROG_OBJCOPY_ABSOLUTE
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
+AC_ARG_ENABLE([build-id],
|
||||||
|
+ [AS_HELP_STRING([--enable-build-id],
|
||||||
|
+ [ask the linker to supply build-id notes (default=no)])])
|
||||||
|
+if test x$enable_build_id = xyes; then
|
||||||
|
+grub_PROG_LD_BUILD_ID_SHA1
|
||||||
|
+else
|
||||||
|
grub_PROG_LD_BUILD_ID_NONE
|
||||||
|
+fi
|
||||||
|
if test "x$target_cpu" = xi386; then
|
||||||
|
if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then
|
||||||
|
if test ! -z "$TARGET_IMG_LDSCRIPT"; then
|
||||||
|
diff --git a/acinclude.m4 b/acinclude.m4
|
||||||
|
index 6e14bb553c6..21238fcfd03 100644
|
||||||
|
--- a/acinclude.m4
|
||||||
|
+++ b/acinclude.m4
|
||||||
|
@@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
+dnl Supply --build-id=sha1 to ld if building modules.
|
||||||
|
+dnl This suppresses warnings from ld on some systems
|
||||||
|
+AC_DEFUN([grub_PROG_LD_BUILD_ID_SHA1],
|
||||||
|
+[AC_MSG_CHECKING([whether linker accepts --build-id=sha1])
|
||||||
|
+AC_CACHE_VAL(grub_cv_prog_ld_build_id_sha1,
|
||||||
|
+[save_LDFLAGS="$LDFLAGS"
|
||||||
|
+LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
|
||||||
|
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||||||
|
+ [grub_cv_prog_ld_build_id_sha1=yes],
|
||||||
|
+ [grub_cv_prog_ld_build_id_sha1=no])
|
||||||
|
+LDFLAGS="$save_LDFLAGS"
|
||||||
|
+])
|
||||||
|
+AC_MSG_RESULT([$grub_cv_prog_ld_build_id_sha1])
|
||||||
|
+
|
||||||
|
+if test "x$grub_cv_prog_ld_build_id_sha1" = xyes; then
|
||||||
|
+ TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,--build-id=sha1"
|
||||||
|
+fi
|
||||||
|
+])
|
||||||
|
+
|
||||||
|
dnl Check nm
|
||||||
|
AC_DEFUN([grub_PROG_NM_WORKS],
|
||||||
|
[AC_MSG_CHECKING([whether nm works])
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Sun, 28 Jun 2015 13:09:58 -0400
|
||||||
|
Subject: [PATCH] Add grub_qdprintf() - grub_dprintf() without the file+line
|
||||||
|
number.
|
||||||
|
|
||||||
|
This just makes copy+paste of our debug loading info easier.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/kern/misc.c | 18 ++++++++++++++++++
|
||||||
|
include/grub/misc.h | 2 ++
|
||||||
|
2 files changed, 20 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
||||||
|
index a432a6be54a..9a2fae6398e 100644
|
||||||
|
--- a/grub-core/kern/misc.c
|
||||||
|
+++ b/grub-core/kern/misc.c
|
||||||
|
@@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+grub_qdprintf (const char *condition, const char *fmt, ...)
|
||||||
|
+{
|
||||||
|
+ va_list args;
|
||||||
|
+ const char *debug = grub_env_get ("debug");
|
||||||
|
+
|
||||||
|
+ if (! debug)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ if (grub_strword (debug, "all") || grub_strword (debug, condition))
|
||||||
|
+ {
|
||||||
|
+ va_start (args, fmt);
|
||||||
|
+ grub_vprintf (fmt, args);
|
||||||
|
+ va_end (args);
|
||||||
|
+ grub_refresh ();
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#define PREALLOC_SIZE 255
|
||||||
|
|
||||||
|
int
|
||||||
|
diff --git a/include/grub/misc.h b/include/grub/misc.h
|
||||||
|
index fd18e6320b8..3adc4036e3b 100644
|
||||||
|
--- a/include/grub/misc.h
|
||||||
|
+++ b/include/grub/misc.h
|
||||||
|
@@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
|
||||||
|
const int line,
|
||||||
|
const char *condition,
|
||||||
|
const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 4, 5)));
|
||||||
|
+void EXPORT_FUNC(grub_qdprintf) (const char *condition,
|
||||||
|
+ const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 2, 3)));
|
||||||
|
int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args);
|
||||||
|
int EXPORT_FUNC(grub_snprintf) (char *str, grub_size_t n, const char *fmt, ...)
|
||||||
|
__attribute__ ((format (GNU_PRINTF, 3, 4)));
|
||||||
@ -0,0 +1,178 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 25 Jun 2015 15:11:36 -0400
|
||||||
|
Subject: [PATCH] Make a "gdb" dprintf that tells us load addresses.
|
||||||
|
|
||||||
|
This makes a grub_dprintf() call during platform init and during module
|
||||||
|
loading that tells us the virtual addresses of the .text and .data
|
||||||
|
sections of grub-core/kernel.exec and any modules it loads.
|
||||||
|
|
||||||
|
Specifically, it displays them in the gdb "add-symbol-file" syntax, with
|
||||||
|
the presumption that there's a variable $grubdir that reflects the path
|
||||||
|
to any such binaries.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/kern/dl.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
grub-core/kern/efi/efi.c | 4 ++--
|
||||||
|
grub-core/kern/efi/init.c | 26 +++++++++++++++++++++++-
|
||||||
|
include/grub/efi/efi.h | 2 +-
|
||||||
|
4 files changed, 78 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
||||||
|
index 88d2077709e..9557254035e 100644
|
||||||
|
--- a/grub-core/kern/dl.c
|
||||||
|
+++ b/grub-core/kern/dl.c
|
||||||
|
@@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name)
|
||||||
|
return s;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
+static long
|
||||||
|
+grub_dl_find_section_index (Elf_Ehdr *e, const char *name)
|
||||||
|
+{
|
||||||
|
+ Elf_Shdr *s;
|
||||||
|
+ const char *str;
|
||||||
|
+ unsigned i;
|
||||||
|
+
|
||||||
|
+ s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shstrndx * e->e_shentsize);
|
||||||
|
+ str = (char *) e + s->sh_offset;
|
||||||
|
+
|
||||||
|
+ for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
|
||||||
|
+ i < e->e_shnum;
|
||||||
|
+ i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
|
||||||
|
+ if (grub_strcmp (str + s->sh_name, name) == 0)
|
||||||
|
+ return (long)i;
|
||||||
|
+ return -1;
|
||||||
|
+}
|
||||||
|
|
||||||
|
/* Me, Vladimir Serbinenko, hereby I add this module check as per new
|
||||||
|
GNU module policy. Note that this license check is informative only.
|
||||||
|
@@ -653,6 +670,37 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
|
||||||
|
|
||||||
|
return GRUB_ERR_NONE;
|
||||||
|
}
|
||||||
|
+static void
|
||||||
|
+grub_dl_print_gdb_info (grub_dl_t mod, Elf_Ehdr *e)
|
||||||
|
+{
|
||||||
|
+ void *text, *data = NULL;
|
||||||
|
+ long idx;
|
||||||
|
+
|
||||||
|
+ idx = grub_dl_find_section_index (e, ".text");
|
||||||
|
+ if (idx < 0)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ text = grub_dl_get_section_addr (mod, idx);
|
||||||
|
+ if (!text)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ idx = grub_dl_find_section_index (e, ".data");
|
||||||
|
+ if (idx >= 0)
|
||||||
|
+ data = grub_dl_get_section_addr (mod, idx);
|
||||||
|
+
|
||||||
|
+ if (data)
|
||||||
|
+ grub_qdprintf ("gdb", "add-symbol-file \\\n"
|
||||||
|
+ "/usr/lib/debug/usr/lib/grub/%s-%s/%s.debug "
|
||||||
|
+ "\\\n %p -s .data %p\n",
|
||||||
|
+ GRUB_TARGET_CPU, GRUB_PLATFORM,
|
||||||
|
+ mod->name, text, data);
|
||||||
|
+ else
|
||||||
|
+ grub_qdprintf ("gdb", "add-symbol-file \\\n"
|
||||||
|
+ "/usr/lib/debug/usr/lib/grub/%s-%s/%s.debug "
|
||||||
|
+ "\\\n%p\n",
|
||||||
|
+ GRUB_TARGET_CPU, GRUB_PLATFORM,
|
||||||
|
+ mod->name, text);
|
||||||
|
+}
|
||||||
|
|
||||||
|
/* Load a module from core memory. */
|
||||||
|
grub_dl_t
|
||||||
|
@@ -712,6 +760,8 @@ grub_dl_load_core_noinit (void *addr, grub_size_t size)
|
||||||
|
grub_dprintf ("modules", "module name: %s\n", mod->name);
|
||||||
|
grub_dprintf ("modules", "init function: %p\n", mod->init);
|
||||||
|
|
||||||
|
+ grub_dl_print_gdb_info (mod, e);
|
||||||
|
+
|
||||||
|
if (grub_dl_add (mod))
|
||||||
|
{
|
||||||
|
grub_dl_unload (mod);
|
||||||
|
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
|
||||||
|
index ae9885edb84..d6a2fb57789 100644
|
||||||
|
--- a/grub-core/kern/efi/efi.c
|
||||||
|
+++ b/grub-core/kern/efi/efi.c
|
||||||
|
@@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
|
||||||
|
/* Search the mods section from the PE32/PE32+ image. This code uses
|
||||||
|
a PE32 header, but should work with PE32+ as well. */
|
||||||
|
grub_addr_t
|
||||||
|
-grub_efi_modules_addr (void)
|
||||||
|
+grub_efi_section_addr (const char *section_name)
|
||||||
|
{
|
||||||
|
grub_efi_loaded_image_t *image;
|
||||||
|
struct grub_pe32_header *header;
|
||||||
|
@@ -321,7 +321,7 @@ grub_efi_modules_addr (void)
|
||||||
|
i < coff_header->num_sections;
|
||||||
|
i++, section++)
|
||||||
|
{
|
||||||
|
- if (grub_strcmp (section->name, "mods") == 0)
|
||||||
|
+ if (grub_strcmp (section->name, section_name) == 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
|
||||||
|
index 6d39bd3ad29..2d12e6188fd 100644
|
||||||
|
--- a/grub-core/kern/efi/init.c
|
||||||
|
+++ b/grub-core/kern/efi/init.c
|
||||||
|
@@ -115,10 +115,33 @@ grub_efi_env_init (void)
|
||||||
|
grub_free (envblk_s.buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void
|
||||||
|
+grub_efi_print_gdb_info (void)
|
||||||
|
+{
|
||||||
|
+ grub_addr_t text;
|
||||||
|
+ grub_addr_t data;
|
||||||
|
+
|
||||||
|
+ text = grub_efi_section_addr (".text");
|
||||||
|
+ if (!text)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ data = grub_efi_section_addr (".data");
|
||||||
|
+ if (data)
|
||||||
|
+ grub_qdprintf ("gdb",
|
||||||
|
+ "add-symbol-file /usr/lib/debug/usr/lib/grub/%s-%s/"
|
||||||
|
+ "kernel.exec %p -s .data %p\n",
|
||||||
|
+ GRUB_TARGET_CPU, GRUB_PLATFORM, (void *)text, (void *)data);
|
||||||
|
+ else
|
||||||
|
+ grub_qdprintf ("gdb",
|
||||||
|
+ "add-symbol-file /usr/lib/debug/usr/lib/grub/%s-%s/"
|
||||||
|
+ "kernel.exec %p\n",
|
||||||
|
+ GRUB_TARGET_CPU, GRUB_PLATFORM, (void *)text);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
grub_efi_init (void)
|
||||||
|
{
|
||||||
|
- grub_modbase = grub_efi_modules_addr ();
|
||||||
|
+ grub_modbase = grub_efi_section_addr ("mods");
|
||||||
|
/* First of all, initialize the console so that GRUB can display
|
||||||
|
messages. */
|
||||||
|
grub_console_init ();
|
||||||
|
@@ -142,6 +165,7 @@ grub_efi_init (void)
|
||||||
|
0, 0, 0, NULL);
|
||||||
|
|
||||||
|
grub_efi_env_init ();
|
||||||
|
+ grub_efi_print_gdb_info ();
|
||||||
|
grub_efidisk_init ();
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
||||||
|
index 03f9a9d0118..2e0691454b1 100644
|
||||||
|
--- a/include/grub/efi/efi.h
|
||||||
|
+++ b/include/grub/efi/efi.h
|
||||||
|
@@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
|
||||||
|
grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, char *args);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-grub_addr_t grub_efi_modules_addr (void);
|
||||||
|
+grub_addr_t grub_efi_section_addr (const char *section);
|
||||||
|
|
||||||
|
void grub_efi_mm_init (void);
|
||||||
|
void grub_efi_mm_fini (void);
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 10 May 2018 13:40:19 -0400
|
||||||
|
Subject: [PATCH] Fixup for newer compiler
|
||||||
|
|
||||||
|
---
|
||||||
|
grub-core/fs/btrfs.c | 2 +-
|
||||||
|
include/grub/gpt_partition.h | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||||||
|
index 2b21cbaa67e..4cc86e9b79e 100644
|
||||||
|
--- a/grub-core/fs/btrfs.c
|
||||||
|
+++ b/grub-core/fs/btrfs.c
|
||||||
|
@@ -218,7 +218,7 @@ struct grub_btrfs_inode
|
||||||
|
grub_uint64_t size;
|
||||||
|
grub_uint8_t dummy2[0x70];
|
||||||
|
struct grub_btrfs_time mtime;
|
||||||
|
-} GRUB_PACKED;
|
||||||
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
||||||
|
|
||||||
|
struct grub_btrfs_extent_data
|
||||||
|
{
|
||||||
|
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
|
||||||
|
index 7a93f43291c..8212697bf6b 100644
|
||||||
|
--- a/include/grub/gpt_partition.h
|
||||||
|
+++ b/include/grub/gpt_partition.h
|
||||||
|
@@ -76,7 +76,7 @@ struct grub_gpt_partentry
|
||||||
|
grub_uint64_t end;
|
||||||
|
grub_uint64_t attrib;
|
||||||
|
char name[72];
|
||||||
|
-} GRUB_PACKED;
|
||||||
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
||||||
|
|
||||||
|
grub_err_t
|
||||||
|
grub_gpt_partition_map_iterate (grub_disk_t disk,
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Sat, 12 May 2018 11:29:07 +0200
|
||||||
|
Subject: [PATCH] Don't attempt to export the start and _start symbols for
|
||||||
|
grub-emu
|
||||||
|
|
||||||
|
Commit 318ee04aadc ("make better backtraces") reworked the backtrace logic
|
||||||
|
but the changes lead to the following build error on the grub-emu platform:
|
||||||
|
|
||||||
|
grub_emu_lite-symlist.o:(.data+0xf08): undefined reference to `start'
|
||||||
|
collect2: error: ld returned 1 exit status
|
||||||
|
make[3]: *** [Makefile:25959: grub-emu-lite] Error 1
|
||||||
|
make[3]: *** Waiting for unfinished jobs....
|
||||||
|
cat kernel_syms.input | grep -v '^#' | sed -n \
|
||||||
|
-e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/defined kernel '""'\1/;p;}' \
|
||||||
|
-e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/defined kernel '""'\1/;p;}' \
|
||||||
|
| sort -u >kernel_syms.lst
|
||||||
|
|
||||||
|
The problem is that start and _start symbols are exported unconditionally,
|
||||||
|
but these aren't defined for grub-emu since is an emultaed platform so it
|
||||||
|
doesn't have a startup logic. Don't attempt to export those for grub-emu.
|
||||||
|
|
||||||
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
---
|
||||||
|
include/grub/kernel.h | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
|
||||||
|
index 300a9766cda..55849777eaa 100644
|
||||||
|
--- a/include/grub/kernel.h
|
||||||
|
+++ b/include/grub/kernel.h
|
||||||
|
@@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !defined(GRUB_MACHINE_EMU)
|
||||||
|
void EXPORT_FUNC(start) (void);
|
||||||
|
void EXPORT_FUNC(_start) (void);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* The start point of the C code. */
|
||||||
|
void grub_main (void) __attribute__ ((noreturn));
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Thu, 10 May 2018 13:40:19 -0400
|
||||||
|
Subject: [PATCH] Fixup for newer compiler
|
||||||
|
|
||||||
|
---
|
||||||
|
conf/Makefile.common | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/conf/Makefile.common b/conf/Makefile.common
|
||||||
|
index 191b1a70c6b..5f0ef969857 100644
|
||||||
|
--- a/conf/Makefile.common
|
||||||
|
+++ b/conf/Makefile.common
|
||||||
|
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
|
||||||
|
LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
|
||||||
|
CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
|
||||||
|
CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
|
||||||
|
-STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
|
||||||
|
+STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes
|
||||||
|
|
||||||
|
CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
|
||||||
|
LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
|
||||||
@ -0,0 +1,766 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrzej Kacprowski <andrzej.kacprowski@intel.com>
|
||||||
|
Date: Wed, 10 Jul 2019 15:22:29 +0200
|
||||||
|
Subject: [PATCH] Add support for non-Ethernet network cards
|
||||||
|
|
||||||
|
This patch replaces fixed 6-byte link layer address with
|
||||||
|
up to 32-byte variable sized address.
|
||||||
|
This allows supporting Infiniband and Omni-Path fabric
|
||||||
|
which use 20-byte address, but other network card types
|
||||||
|
can also take advantage of this change.
|
||||||
|
The network card driver is responsible for replacing L2
|
||||||
|
header provided by grub2 if needed.
|
||||||
|
This approach is compatible with UEFI network stack which
|
||||||
|
also allows up to 32-byte variable size link address.
|
||||||
|
|
||||||
|
The BOOTP/DHCP packet format is limited to 16 byte client
|
||||||
|
hardware address, if link address is more that 16-bytes
|
||||||
|
then chaddr field in BOOTP it will be set to 0 as per rfc4390.
|
||||||
|
|
||||||
|
Resolves: rhbz#1370642
|
||||||
|
|
||||||
|
Signed-off-by: Andrzej Kacprowski <andrzej.kacprowski@intel.com>
|
||||||
|
[msalter: Fix max string calculation in grub_net_hwaddr_to_str]
|
||||||
|
Signed-off-by: Mark Salter <msalter@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/net/arp.c | 155 ++++++++++++++++++++++-----------
|
||||||
|
grub-core/net/bootp.c | 15 ++--
|
||||||
|
grub-core/net/drivers/efi/efinet.c | 8 +-
|
||||||
|
grub-core/net/drivers/emu/emunet.c | 1 +
|
||||||
|
grub-core/net/drivers/i386/pc/pxe.c | 13 +--
|
||||||
|
grub-core/net/drivers/ieee1275/ofnet.c | 2 +
|
||||||
|
grub-core/net/drivers/uboot/ubootnet.c | 1 +
|
||||||
|
grub-core/net/ethernet.c | 88 +++++++++----------
|
||||||
|
grub-core/net/icmp6.c | 15 ++--
|
||||||
|
grub-core/net/ip.c | 4 +-
|
||||||
|
grub-core/net/net.c | 50 ++++++-----
|
||||||
|
include/grub/net.h | 19 ++--
|
||||||
|
12 files changed, 219 insertions(+), 152 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
|
||||||
|
index 54306e3b16d..67b409a8acc 100644
|
||||||
|
--- a/grub-core/net/arp.c
|
||||||
|
+++ b/grub-core/net/arp.c
|
||||||
|
@@ -31,22 +31,12 @@ enum
|
||||||
|
ARP_REPLY = 2
|
||||||
|
};
|
||||||
|
|
||||||
|
-enum
|
||||||
|
- {
|
||||||
|
- /* IANA ARP constant to define hardware type as ethernet. */
|
||||||
|
- GRUB_NET_ARPHRD_ETHERNET = 1
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
-struct arppkt {
|
||||||
|
+struct arphdr {
|
||||||
|
grub_uint16_t hrd;
|
||||||
|
grub_uint16_t pro;
|
||||||
|
grub_uint8_t hln;
|
||||||
|
grub_uint8_t pln;
|
||||||
|
grub_uint16_t op;
|
||||||
|
- grub_uint8_t sender_mac[6];
|
||||||
|
- grub_uint32_t sender_ip;
|
||||||
|
- grub_uint8_t recv_mac[6];
|
||||||
|
- grub_uint32_t recv_ip;
|
||||||
|
} GRUB_PACKED;
|
||||||
|
|
||||||
|
static int have_pending;
|
||||||
|
@@ -57,12 +47,16 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
|
||||||
|
const grub_net_network_level_address_t *proto_addr)
|
||||||
|
{
|
||||||
|
struct grub_net_buff nb;
|
||||||
|
- struct arppkt *arp_packet;
|
||||||
|
+ struct arphdr *arp_header;
|
||||||
|
grub_net_link_level_address_t target_mac_addr;
|
||||||
|
grub_err_t err;
|
||||||
|
int i;
|
||||||
|
grub_uint8_t *nbd;
|
||||||
|
grub_uint8_t arp_data[128];
|
||||||
|
+ grub_uint8_t hln;
|
||||||
|
+ grub_uint8_t pln;
|
||||||
|
+ grub_uint8_t arp_packet_len;
|
||||||
|
+ grub_uint8_t *tmp_ptr;
|
||||||
|
|
||||||
|
if (proto_addr->type != GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4)
|
||||||
|
return grub_error (GRUB_ERR_BUG, "unsupported address family");
|
||||||
|
@@ -73,23 +67,39 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
|
||||||
|
grub_netbuff_clear (&nb);
|
||||||
|
grub_netbuff_reserve (&nb, 128);
|
||||||
|
|
||||||
|
- err = grub_netbuff_push (&nb, sizeof (*arp_packet));
|
||||||
|
+ hln = inf->card->default_address.len;
|
||||||
|
+ pln = sizeof (proto_addr->ipv4);
|
||||||
|
+ arp_packet_len = sizeof (*arp_header) + 2 * (hln + pln);
|
||||||
|
+
|
||||||
|
+ err = grub_netbuff_push (&nb, arp_packet_len);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
- arp_packet = (struct arppkt *) nb.data;
|
||||||
|
- arp_packet->hrd = grub_cpu_to_be16_compile_time (GRUB_NET_ARPHRD_ETHERNET);
|
||||||
|
- arp_packet->hln = 6;
|
||||||
|
- arp_packet->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
|
||||||
|
- arp_packet->pln = 4;
|
||||||
|
- arp_packet->op = grub_cpu_to_be16_compile_time (ARP_REQUEST);
|
||||||
|
- /* Sender hardware address. */
|
||||||
|
- grub_memcpy (arp_packet->sender_mac, &inf->hwaddress.mac, 6);
|
||||||
|
- arp_packet->sender_ip = inf->address.ipv4;
|
||||||
|
- grub_memset (arp_packet->recv_mac, 0, 6);
|
||||||
|
- arp_packet->recv_ip = proto_addr->ipv4;
|
||||||
|
- /* Target protocol address */
|
||||||
|
- grub_memset (&target_mac_addr.mac, 0xff, 6);
|
||||||
|
+ arp_header = (struct arphdr *) nb.data;
|
||||||
|
+ arp_header->hrd = grub_cpu_to_be16 (inf->card->default_address.type);
|
||||||
|
+ arp_header->hln = hln;
|
||||||
|
+ arp_header->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
|
||||||
|
+ arp_header->pln = pln;
|
||||||
|
+ arp_header->op = grub_cpu_to_be16_compile_time (ARP_REQUEST);
|
||||||
|
+ tmp_ptr = nb.data + sizeof (*arp_header);
|
||||||
|
+
|
||||||
|
+ /* The source hardware address. */
|
||||||
|
+ grub_memcpy (tmp_ptr, inf->hwaddress.mac, hln);
|
||||||
|
+ tmp_ptr += hln;
|
||||||
|
+
|
||||||
|
+ /* The source protocol address. */
|
||||||
|
+ grub_memcpy (tmp_ptr, &inf->address.ipv4, pln);
|
||||||
|
+ tmp_ptr += pln;
|
||||||
|
+
|
||||||
|
+ /* The target hardware address. */
|
||||||
|
+ grub_memset (tmp_ptr, 0, hln);
|
||||||
|
+ tmp_ptr += hln;
|
||||||
|
+
|
||||||
|
+ /* The target protocol address */
|
||||||
|
+ grub_memcpy (tmp_ptr, &proto_addr->ipv4, pln);
|
||||||
|
+ tmp_ptr += pln;
|
||||||
|
+
|
||||||
|
+ grub_memset (&target_mac_addr.mac, 0xff, hln);
|
||||||
|
|
||||||
|
nbd = nb.data;
|
||||||
|
send_ethernet_packet (inf, &nb, target_mac_addr, GRUB_NET_ETHERTYPE_ARP);
|
||||||
|
@@ -114,28 +124,53 @@ grub_err_t
|
||||||
|
grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
|
||||||
|
grub_uint16_t *vlantag)
|
||||||
|
{
|
||||||
|
- struct arppkt *arp_packet = (struct arppkt *) nb->data;
|
||||||
|
+ struct arphdr *arp_header = (struct arphdr *) nb->data;
|
||||||
|
grub_net_network_level_address_t sender_addr, target_addr;
|
||||||
|
grub_net_link_level_address_t sender_mac_addr;
|
||||||
|
struct grub_net_network_level_interface *inf;
|
||||||
|
+ grub_uint16_t hw_type;
|
||||||
|
+ grub_uint8_t hln;
|
||||||
|
+ grub_uint8_t pln;
|
||||||
|
+ grub_uint8_t arp_packet_len;
|
||||||
|
+ grub_uint8_t *tmp_ptr;
|
||||||
|
|
||||||
|
- if (arp_packet->pro != grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP)
|
||||||
|
- || arp_packet->pln != 4 || arp_packet->hln != 6
|
||||||
|
- || nb->tail - nb->data < (int) sizeof (*arp_packet))
|
||||||
|
+ hw_type = card->default_address.type;
|
||||||
|
+ hln = card->default_address.len;
|
||||||
|
+ pln = sizeof(sender_addr.ipv4);
|
||||||
|
+ arp_packet_len = sizeof (*arp_header) + 2 * (pln + hln);
|
||||||
|
+
|
||||||
|
+ if (arp_header->pro != grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP)
|
||||||
|
+ || arp_header->hrd != grub_cpu_to_be16 (hw_type)
|
||||||
|
+ || arp_header->hln != hln || arp_header->pln != pln
|
||||||
|
+ || nb->tail - nb->data < (int) arp_packet_len) {
|
||||||
|
return GRUB_ERR_NONE;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
+ tmp_ptr = nb->data + sizeof (*arp_header);
|
||||||
|
+
|
||||||
|
+ /* The source hardware address. */
|
||||||
|
+ sender_mac_addr.type = hw_type;
|
||||||
|
+ sender_mac_addr.len = hln;
|
||||||
|
+ grub_memcpy (sender_mac_addr.mac, tmp_ptr, hln);
|
||||||
|
+ tmp_ptr += hln;
|
||||||
|
+
|
||||||
|
+ /* The source protocol address. */
|
||||||
|
sender_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
|
||||||
|
+ grub_memcpy(&sender_addr.ipv4, tmp_ptr, pln);
|
||||||
|
+ tmp_ptr += pln;
|
||||||
|
+
|
||||||
|
+ grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
|
||||||
|
+
|
||||||
|
+ /* The target hardware address. */
|
||||||
|
+ tmp_ptr += hln;
|
||||||
|
+
|
||||||
|
+ /* The target protocol address. */
|
||||||
|
target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
|
||||||
|
- sender_addr.ipv4 = arp_packet->sender_ip;
|
||||||
|
- target_addr.ipv4 = arp_packet->recv_ip;
|
||||||
|
- if (arp_packet->sender_ip == pending_req)
|
||||||
|
+ grub_memcpy(&target_addr.ipv4, tmp_ptr, pln);
|
||||||
|
+
|
||||||
|
+ if (sender_addr.ipv4 == pending_req)
|
||||||
|
have_pending = 1;
|
||||||
|
|
||||||
|
- sender_mac_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (sender_mac_addr.mac, arp_packet->sender_mac,
|
||||||
|
- sizeof (sender_mac_addr.mac));
|
||||||
|
- grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
|
||||||
|
-
|
||||||
|
FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
|
||||||
|
{
|
||||||
|
/* Verify vlantag id */
|
||||||
|
@@ -148,11 +183,11 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
|
||||||
|
|
||||||
|
/* Am I the protocol address target? */
|
||||||
|
if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
|
||||||
|
- && arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
|
||||||
|
+ && arp_header->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
|
||||||
|
{
|
||||||
|
grub_net_link_level_address_t target;
|
||||||
|
struct grub_net_buff nb_reply;
|
||||||
|
- struct arppkt *arp_reply;
|
||||||
|
+ struct arphdr *arp_reply;
|
||||||
|
grub_uint8_t arp_data[128];
|
||||||
|
grub_err_t err;
|
||||||
|
|
||||||
|
@@ -161,25 +196,39 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
|
||||||
|
grub_netbuff_clear (&nb_reply);
|
||||||
|
grub_netbuff_reserve (&nb_reply, 128);
|
||||||
|
|
||||||
|
- err = grub_netbuff_push (&nb_reply, sizeof (*arp_packet));
|
||||||
|
+ err = grub_netbuff_push (&nb_reply, arp_packet_len);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
- arp_reply = (struct arppkt *) nb_reply.data;
|
||||||
|
+ arp_reply = (struct arphdr *) nb_reply.data;
|
||||||
|
|
||||||
|
- arp_reply->hrd = grub_cpu_to_be16_compile_time (GRUB_NET_ARPHRD_ETHERNET);
|
||||||
|
+ arp_reply->hrd = grub_cpu_to_be16 (hw_type);
|
||||||
|
arp_reply->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
|
||||||
|
- arp_reply->pln = 4;
|
||||||
|
- arp_reply->hln = 6;
|
||||||
|
+ arp_reply->pln = pln;
|
||||||
|
+ arp_reply->hln = hln;
|
||||||
|
arp_reply->op = grub_cpu_to_be16_compile_time (ARP_REPLY);
|
||||||
|
- arp_reply->sender_ip = arp_packet->recv_ip;
|
||||||
|
- arp_reply->recv_ip = arp_packet->sender_ip;
|
||||||
|
- arp_reply->hln = 6;
|
||||||
|
-
|
||||||
|
- target.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (target.mac, arp_packet->sender_mac, 6);
|
||||||
|
- grub_memcpy (arp_reply->sender_mac, inf->hwaddress.mac, 6);
|
||||||
|
- grub_memcpy (arp_reply->recv_mac, arp_packet->sender_mac, 6);
|
||||||
|
+
|
||||||
|
+ tmp_ptr = nb_reply.data + sizeof (*arp_reply);
|
||||||
|
+
|
||||||
|
+ /* The source hardware address. */
|
||||||
|
+ grub_memcpy (tmp_ptr, inf->hwaddress.mac, hln);
|
||||||
|
+ tmp_ptr += hln;
|
||||||
|
+
|
||||||
|
+ /* The source protocol address. */
|
||||||
|
+ grub_memcpy (tmp_ptr, &target_addr.ipv4, pln);
|
||||||
|
+ tmp_ptr += pln;
|
||||||
|
+
|
||||||
|
+ /* The target hardware address. */
|
||||||
|
+ grub_memcpy (tmp_ptr, sender_mac_addr.mac, hln);
|
||||||
|
+ tmp_ptr += hln;
|
||||||
|
+
|
||||||
|
+ /* The target protocol address */
|
||||||
|
+ grub_memcpy (tmp_ptr, &sender_addr.ipv4, pln);
|
||||||
|
+ tmp_ptr += pln;
|
||||||
|
+
|
||||||
|
+ target.type = hw_type;
|
||||||
|
+ target.len = hln;
|
||||||
|
+ grub_memcpy (target.mac, sender_mac_addr.mac, hln);
|
||||||
|
|
||||||
|
/* Change operation to REPLY and send packet */
|
||||||
|
send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
|
||||||
|
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
||||||
|
index e28fb6a09f9..08b6b2b5d6c 100644
|
||||||
|
--- a/grub-core/net/bootp.c
|
||||||
|
+++ b/grub-core/net/bootp.c
|
||||||
|
@@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
||||||
|
int is_def, char **device, char **path)
|
||||||
|
{
|
||||||
|
grub_net_network_level_address_t addr;
|
||||||
|
- grub_net_link_level_address_t hwaddr;
|
||||||
|
struct grub_net_network_level_interface *inter;
|
||||||
|
int mask = -1;
|
||||||
|
char server_ip[sizeof ("xxx.xxx.xxx.xxx")];
|
||||||
|
@@ -250,12 +249,8 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
||||||
|
if (path)
|
||||||
|
*path = 0;
|
||||||
|
|
||||||
|
- grub_memcpy (hwaddr.mac, bp->mac_addr,
|
||||||
|
- bp->hw_len < sizeof (hwaddr.mac) ? bp->hw_len
|
||||||
|
- : sizeof (hwaddr.mac));
|
||||||
|
- hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
-
|
||||||
|
- inter = grub_net_add_addr (name, card, &addr, &hwaddr, flags);
|
||||||
|
+ grub_dprintf("dhcp", "configuring dhcp for %s\n", name);
|
||||||
|
+ inter = grub_net_add_addr (name, card, &addr, &card->default_address, flags);
|
||||||
|
if (!inter)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
@@ -567,7 +562,9 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
|
||||||
|
grub_memset (pack, 0, sizeof (*pack));
|
||||||
|
pack->opcode = 1;
|
||||||
|
pack->hw_type = 1;
|
||||||
|
- pack->hw_len = 6;
|
||||||
|
+ pack->hw_len = iface->hwaddress.len > 16 ? 0
|
||||||
|
+ : iface->hwaddress.len;
|
||||||
|
+
|
||||||
|
err = grub_get_datetime (&date);
|
||||||
|
if (err || !grub_datetime2unixtime (&date, &t))
|
||||||
|
{
|
||||||
|
@@ -580,7 +577,7 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
|
||||||
|
else
|
||||||
|
pack->ident = iface->xid;
|
||||||
|
|
||||||
|
- grub_memcpy (&pack->mac_addr, &iface->hwaddress.mac, 6);
|
||||||
|
+ grub_memcpy (&pack->mac_addr, &iface->hwaddress.mac, pack->hw_len);
|
||||||
|
|
||||||
|
grub_netbuff_push (nb, sizeof (*udph));
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
index 173fb63153c..a673bea807a 100644
|
||||||
|
--- a/grub-core/net/drivers/efi/efinet.c
|
||||||
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
@@ -279,6 +279,9 @@ grub_efinet_findcards (void)
|
||||||
|
/* This should not happen... Why? */
|
||||||
|
continue;
|
||||||
|
|
||||||
|
+ if (net->mode->hwaddr_size > GRUB_NET_MAX_LINK_ADDRESS_SIZE)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
|
||||||
|
&& efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
|
||||||
|
continue;
|
||||||
|
@@ -315,10 +318,11 @@ grub_efinet_findcards (void)
|
||||||
|
card->name = grub_xasprintf ("efinet%d", i++);
|
||||||
|
card->driver = &efidriver;
|
||||||
|
card->flags = 0;
|
||||||
|
- card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
+ card->default_address.type = net->mode->if_type;
|
||||||
|
+ card->default_address.len = net->mode->hwaddr_size;
|
||||||
|
grub_memcpy (card->default_address.mac,
|
||||||
|
net->mode->current_address,
|
||||||
|
- sizeof (card->default_address.mac));
|
||||||
|
+ net->mode->hwaddr_size);
|
||||||
|
card->efi_net = net;
|
||||||
|
card->efi_handle = *handle;
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c
|
||||||
|
index b194920861f..5b6c5e16a6d 100644
|
||||||
|
--- a/grub-core/net/drivers/emu/emunet.c
|
||||||
|
+++ b/grub-core/net/drivers/emu/emunet.c
|
||||||
|
@@ -46,6 +46,7 @@ static struct grub_net_card emucard =
|
||||||
|
.mtu = 1500,
|
||||||
|
.default_address = {
|
||||||
|
.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET,
|
||||||
|
+ . len = 6,
|
||||||
|
{.mac = {0, 1, 2, 3, 4, 5}}
|
||||||
|
},
|
||||||
|
.flags = 0
|
||||||
|
diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
|
||||||
|
index 3f4152d036c..9f8fb4b6d2b 100644
|
||||||
|
--- a/grub-core/net/drivers/i386/pc/pxe.c
|
||||||
|
+++ b/grub-core/net/drivers/i386/pc/pxe.c
|
||||||
|
@@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe)
|
||||||
|
grub_memset (ui, 0, sizeof (*ui));
|
||||||
|
grub_pxe_call (GRUB_PXENV_UNDI_GET_INFORMATION, ui, pxe_rm_entry);
|
||||||
|
|
||||||
|
+ grub_pxe_card.default_address.len = 6;
|
||||||
|
grub_memcpy (grub_pxe_card.default_address.mac, ui->current_addr,
|
||||||
|
- sizeof (grub_pxe_card.default_address.mac));
|
||||||
|
- for (i = 0; i < sizeof (grub_pxe_card.default_address.mac); i++)
|
||||||
|
+ grub_pxe_card.default_address.len);
|
||||||
|
+ for (i = 0; i < grub_pxe_card.default_address.len; i++)
|
||||||
|
if (grub_pxe_card.default_address.mac[i] != 0)
|
||||||
|
break;
|
||||||
|
- if (i != sizeof (grub_pxe_card.default_address.mac))
|
||||||
|
+ if (i != grub_pxe_card.default_address.len)
|
||||||
|
{
|
||||||
|
- for (i = 0; i < sizeof (grub_pxe_card.default_address.mac); i++)
|
||||||
|
+ for (i = 0; i < grub_pxe_card.default_address.len; i++)
|
||||||
|
if (grub_pxe_card.default_address.mac[i] != 0xff)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
- if (i == sizeof (grub_pxe_card.default_address.mac))
|
||||||
|
+ if (i == grub_pxe_card.default_address.len)
|
||||||
|
grub_memcpy (grub_pxe_card.default_address.mac, ui->permanent_addr,
|
||||||
|
- sizeof (grub_pxe_card.default_address.mac));
|
||||||
|
+ grub_pxe_card.default_address.len);
|
||||||
|
grub_pxe_card.mtu = ui->mtu;
|
||||||
|
|
||||||
|
grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
|
||||||
|
index 3860b6f78d8..bcb3f9ea02d 100644
|
||||||
|
--- a/grub-core/net/drivers/ieee1275/ofnet.c
|
||||||
|
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
|
||||||
|
@@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
|
||||||
|
grub_uint16_t vlantag = 0;
|
||||||
|
|
||||||
|
hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
+ hw_addr.len = 6;
|
||||||
|
|
||||||
|
args = bootpath + grub_strlen (devpath) + 1;
|
||||||
|
do
|
||||||
|
@@ -503,6 +504,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
|
||||||
|
grub_memcpy (&lla.mac, pprop, 6);
|
||||||
|
|
||||||
|
lla.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
+ lla.len = 6;
|
||||||
|
card->default_address = lla;
|
||||||
|
|
||||||
|
card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
|
||||||
|
diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c
|
||||||
|
index 056052e40d5..22ebcbf211e 100644
|
||||||
|
--- a/grub-core/net/drivers/uboot/ubootnet.c
|
||||||
|
+++ b/grub-core/net/drivers/uboot/ubootnet.c
|
||||||
|
@@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet)
|
||||||
|
|
||||||
|
grub_memcpy (&(card->default_address.mac), &devinfo->di_net.hwaddr, 6);
|
||||||
|
card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
+ card->default_address.len = 6;
|
||||||
|
|
||||||
|
card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
|
||||||
|
card->txbuf = grub_zalloc (card->txbufsize);
|
||||||
|
diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
|
||||||
|
index 4d7ceed6f93..9aae83a5eb4 100644
|
||||||
|
--- a/grub-core/net/ethernet.c
|
||||||
|
+++ b/grub-core/net/ethernet.c
|
||||||
|
@@ -29,13 +29,6 @@
|
||||||
|
|
||||||
|
#define LLCADDRMASK 0x7f
|
||||||
|
|
||||||
|
-struct etherhdr
|
||||||
|
-{
|
||||||
|
- grub_uint8_t dst[6];
|
||||||
|
- grub_uint8_t src[6];
|
||||||
|
- grub_uint16_t type;
|
||||||
|
-} GRUB_PACKED;
|
||||||
|
-
|
||||||
|
struct llchdr
|
||||||
|
{
|
||||||
|
grub_uint8_t dsap;
|
||||||
|
@@ -55,13 +48,15 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
|
||||||
|
grub_net_link_level_address_t target_addr,
|
||||||
|
grub_net_ethertype_t ethertype)
|
||||||
|
{
|
||||||
|
- struct etherhdr *eth;
|
||||||
|
+ grub_uint8_t *eth;
|
||||||
|
grub_err_t err;
|
||||||
|
- grub_uint8_t etherhdr_size;
|
||||||
|
- grub_uint16_t vlantag_id = VLANTAG_IDENTIFIER;
|
||||||
|
+ grub_uint32_t vlantag = 0;
|
||||||
|
+ grub_uint8_t hw_addr_len = inf->card->default_address.len;
|
||||||
|
+ grub_uint8_t etherhdr_size = 2 * hw_addr_len + 2;
|
||||||
|
|
||||||
|
- etherhdr_size = sizeof (*eth);
|
||||||
|
- COMPILE_TIME_ASSERT (sizeof (*eth) + 4 < GRUB_NET_MAX_LINK_HEADER_SIZE);
|
||||||
|
+ /* Source and destination link addresses + ethertype + vlan tag */
|
||||||
|
+ COMPILE_TIME_ASSERT ((GRUB_NET_MAX_LINK_ADDRESS_SIZE * 2 + 2 + 4) <
|
||||||
|
+ GRUB_NET_MAX_LINK_HEADER_SIZE);
|
||||||
|
|
||||||
|
/* Increase ethernet header in case of vlantag */
|
||||||
|
if (inf->vlantag != 0)
|
||||||
|
@@ -70,11 +65,22 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
|
||||||
|
err = grub_netbuff_push (nb, etherhdr_size);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
- eth = (struct etherhdr *) nb->data;
|
||||||
|
- grub_memcpy (eth->dst, target_addr.mac, 6);
|
||||||
|
- grub_memcpy (eth->src, inf->hwaddress.mac, 6);
|
||||||
|
+ eth = nb->data;
|
||||||
|
+ grub_memcpy (eth, target_addr.mac, hw_addr_len);
|
||||||
|
+ eth += hw_addr_len;
|
||||||
|
+ grub_memcpy (eth, inf->hwaddress.mac, hw_addr_len);
|
||||||
|
+ eth += hw_addr_len;
|
||||||
|
+
|
||||||
|
+ /* Check if a vlan-tag is present. */
|
||||||
|
+ if (vlantag != 0)
|
||||||
|
+ {
|
||||||
|
+ *((grub_uint32_t *)eth) = grub_cpu_to_be32 (vlantag);
|
||||||
|
+ eth += sizeof (vlantag);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* Write ethertype */
|
||||||
|
+ *((grub_uint16_t*) eth) = grub_cpu_to_be16 (ethertype);
|
||||||
|
|
||||||
|
- eth->type = grub_cpu_to_be16 (ethertype);
|
||||||
|
if (!inf->card->opened)
|
||||||
|
{
|
||||||
|
err = GRUB_ERR_NONE;
|
||||||
|
@@ -85,18 +91,6 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
|
||||||
|
inf->card->opened = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Check and add a vlan-tag if needed. */
|
||||||
|
- if (inf->vlantag != 0)
|
||||||
|
- {
|
||||||
|
- /* Move eth type to the right */
|
||||||
|
- grub_memcpy ((char *) nb->data + etherhdr_size - 2,
|
||||||
|
- (char *) nb->data + etherhdr_size - 6, 2);
|
||||||
|
-
|
||||||
|
- /* Add the tag in the middle */
|
||||||
|
- grub_memcpy ((char *) nb->data + etherhdr_size - 6, &vlantag_id, 2);
|
||||||
|
- grub_memcpy ((char *) nb->data + etherhdr_size - 4, (char *) &(inf->vlantag), 2);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
return inf->card->driver->send (inf->card, nb);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -104,31 +98,40 @@ grub_err_t
|
||||||
|
grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
|
||||||
|
struct grub_net_card *card)
|
||||||
|
{
|
||||||
|
- struct etherhdr *eth;
|
||||||
|
+ grub_uint8_t *eth;
|
||||||
|
struct llchdr *llch;
|
||||||
|
struct snaphdr *snaph;
|
||||||
|
grub_net_ethertype_t type;
|
||||||
|
grub_net_link_level_address_t hwaddress;
|
||||||
|
grub_net_link_level_address_t src_hwaddress;
|
||||||
|
grub_err_t err;
|
||||||
|
- grub_uint8_t etherhdr_size = sizeof (*eth);
|
||||||
|
+ grub_uint8_t hw_addr_len = card->default_address.len;
|
||||||
|
+ grub_uint8_t etherhdr_size = 2 * hw_addr_len + 2;
|
||||||
|
grub_uint16_t vlantag = 0;
|
||||||
|
|
||||||
|
+ eth = nb->data;
|
||||||
|
|
||||||
|
- /* Check if a vlan-tag is present. If so, the ethernet header is 4 bytes */
|
||||||
|
- /* longer than the original one. The vlantag id is extracted and the header */
|
||||||
|
- /* is reseted to the original size. */
|
||||||
|
- if (grub_get_unaligned16 (nb->data + etherhdr_size - 2) == VLANTAG_IDENTIFIER)
|
||||||
|
+ hwaddress.type = card->default_address.type;
|
||||||
|
+ hwaddress.len = hw_addr_len;
|
||||||
|
+ grub_memcpy (hwaddress.mac, eth, hw_addr_len);
|
||||||
|
+ eth += hw_addr_len;
|
||||||
|
+
|
||||||
|
+ src_hwaddress.type = card->default_address.type;
|
||||||
|
+ src_hwaddress.len = hw_addr_len;
|
||||||
|
+ grub_memcpy (src_hwaddress.mac, eth, hw_addr_len);
|
||||||
|
+ eth += hw_addr_len;
|
||||||
|
+
|
||||||
|
+ type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
|
||||||
|
+ if (type == VLANTAG_IDENTIFIER)
|
||||||
|
{
|
||||||
|
- vlantag = grub_get_unaligned16 (nb->data + etherhdr_size);
|
||||||
|
+ /* Skip vlan tag */
|
||||||
|
+ eth += 2;
|
||||||
|
+ vlantag = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
|
||||||
|
etherhdr_size += 4;
|
||||||
|
- /* Move eth type to the original position */
|
||||||
|
- grub_memcpy((char *) nb->data + etherhdr_size - 6,
|
||||||
|
- (char *) nb->data + etherhdr_size - 2, 2);
|
||||||
|
+ eth += 2;
|
||||||
|
+ type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
|
||||||
|
}
|
||||||
|
|
||||||
|
- eth = (struct etherhdr *) nb->data;
|
||||||
|
- type = grub_be_to_cpu16 (eth->type);
|
||||||
|
err = grub_netbuff_pull (nb, etherhdr_size);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
@@ -148,11 +151,6 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- hwaddress.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (hwaddress.mac, eth->dst, sizeof (hwaddress.mac));
|
||||||
|
- src_hwaddress.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (src_hwaddress.mac, eth->src, sizeof (src_hwaddress.mac));
|
||||||
|
-
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
/* ARP packet. */
|
||||||
|
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
|
||||||
|
index 2cbd95dce25..56a3ec5c8e8 100644
|
||||||
|
--- a/grub-core/net/icmp6.c
|
||||||
|
+++ b/grub-core/net/icmp6.c
|
||||||
|
@@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
|
||||||
|
&& ohdr->len == 1)
|
||||||
|
{
|
||||||
|
grub_net_link_level_address_t ll_address;
|
||||||
|
- ll_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (ll_address.mac, ohdr + 1, sizeof (ll_address.mac));
|
||||||
|
+ ll_address.type = card->default_address.type;
|
||||||
|
+ ll_address.len = card->default_address.len;
|
||||||
|
+ grub_memcpy (ll_address.mac, ohdr + 1, ll_address.len);
|
||||||
|
grub_net_link_layer_add_address (card, source, &ll_address, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -335,8 +336,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
|
||||||
|
&& ohdr->len == 1)
|
||||||
|
{
|
||||||
|
grub_net_link_level_address_t ll_address;
|
||||||
|
- ll_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (ll_address.mac, ohdr + 1, sizeof (ll_address.mac));
|
||||||
|
+ ll_address.type = card->default_address.type;
|
||||||
|
+ ll_address.len = card->default_address.len;
|
||||||
|
+ grub_memcpy (ll_address.mac, ohdr + 1, ll_address.len);
|
||||||
|
grub_net_link_layer_add_address (card, source, &ll_address, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -384,8 +386,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
|
||||||
|
&& ohdr->len == 1)
|
||||||
|
{
|
||||||
|
grub_net_link_level_address_t ll_address;
|
||||||
|
- ll_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memcpy (ll_address.mac, ohdr + 1, sizeof (ll_address.mac));
|
||||||
|
+ ll_address.type = card->default_address.type;
|
||||||
|
+ ll_address.len = card->default_address.len;
|
||||||
|
+ grub_memcpy (ll_address.mac, ohdr + 1, ll_address.len);
|
||||||
|
grub_net_link_layer_add_address (card, source, &ll_address, 0);
|
||||||
|
}
|
||||||
|
if (ohdr->type == OPTION_PREFIX && ohdr->len == 4)
|
||||||
|
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
|
||||||
|
index ea5edf8f1f6..a5896f6dc26 100644
|
||||||
|
--- a/grub-core/net/ip.c
|
||||||
|
+++ b/grub-core/net/ip.c
|
||||||
|
@@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb,
|
||||||
|
if (inf->card == card
|
||||||
|
&& inf->address.type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV
|
||||||
|
&& inf->hwaddress.type == GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
|
||||||
|
- && grub_memcmp (inf->hwaddress.mac, &bootp->mac_addr,
|
||||||
|
- sizeof (inf->hwaddress.mac)) == 0)
|
||||||
|
+ && (grub_memcmp (inf->hwaddress.mac, &bootp->mac_addr,
|
||||||
|
+ bootp->hw_len) == 0 || bootp->hw_len == 0))
|
||||||
|
{
|
||||||
|
grub_net_process_dhcp (nb, inf);
|
||||||
|
grub_netbuff_free (nb);
|
||||||
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
||||||
|
index 22f2689aaeb..a46f82362ed 100644
|
||||||
|
--- a/grub-core/net/net.c
|
||||||
|
+++ b/grub-core/net/net.c
|
||||||
|
@@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
|
||||||
|
<< 48)
|
||||||
|
&& proto_addr->ipv6[1] == (grub_be_to_cpu64_compile_time (1))))
|
||||||
|
{
|
||||||
|
- hw_addr->type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
- grub_memset (hw_addr->mac, -1, 6);
|
||||||
|
+ hw_addr->type = inf->card->default_address.type;
|
||||||
|
+ hw_addr->len = inf->card->default_address.len;
|
||||||
|
+ grub_memset (hw_addr->mac, -1, hw_addr->len);
|
||||||
|
return GRUB_ERR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -142,6 +143,7 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
|
||||||
|
&& ((grub_be_to_cpu64 (proto_addr->ipv6[0]) >> 56) == 0xff))
|
||||||
|
{
|
||||||
|
hw_addr->type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
|
||||||
|
+ hw_addr->len = inf->card->default_address.len;
|
||||||
|
hw_addr->mac[0] = 0x33;
|
||||||
|
hw_addr->mac[1] = 0x33;
|
||||||
|
hw_addr->mac[2] = ((grub_be_to_cpu64 (proto_addr->ipv6[1]) >> 24) & 0xff);
|
||||||
|
@@ -762,23 +764,23 @@ grub_net_addr_to_str (const grub_net_network_level_address_t *target, char *buf)
|
||||||
|
void
|
||||||
|
grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
|
||||||
|
{
|
||||||
|
- str[0] = 0;
|
||||||
|
- switch (addr->type)
|
||||||
|
+ char *ptr;
|
||||||
|
+ unsigned i;
|
||||||
|
+ int maxstr;
|
||||||
|
+
|
||||||
|
+ if (addr->len > GRUB_NET_MAX_LINK_ADDRESS_SIZE)
|
||||||
|
{
|
||||||
|
- case GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET:
|
||||||
|
- {
|
||||||
|
- char *ptr;
|
||||||
|
- unsigned i;
|
||||||
|
- for (ptr = str, i = 0; i < ARRAY_SIZE (addr->mac); i++)
|
||||||
|
- {
|
||||||
|
- grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str),
|
||||||
|
- "%02x:", addr->mac[i] & 0xff);
|
||||||
|
- ptr += (sizeof ("XX:") - 1);
|
||||||
|
- }
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
+ str[0] = 0;
|
||||||
|
+ grub_printf (_("Unsupported hw address type %d len %d\n"),
|
||||||
|
+ addr->type, addr->len);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ maxstr = addr->len * grub_strlen ("XX:");
|
||||||
|
+ for (ptr = str, i = 0; i < addr->len; i++)
|
||||||
|
+ {
|
||||||
|
+ ptr += grub_snprintf (ptr, maxstr - (ptr - str),
|
||||||
|
+ "%02x:", addr->mac[i] & 0xff);
|
||||||
|
}
|
||||||
|
- grub_printf (_("Unsupported hw address type %d\n"), addr->type);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
@@ -789,13 +791,17 @@ grub_net_hwaddr_cmp (const grub_net_link_level_address_t *a,
|
||||||
|
return -1;
|
||||||
|
if (a->type > b->type)
|
||||||
|
return +1;
|
||||||
|
- switch (a->type)
|
||||||
|
+ if (a->len < b->len)
|
||||||
|
+ return -1;
|
||||||
|
+ if (a->len > b->len)
|
||||||
|
+ return +1;
|
||||||
|
+ if (a->len > GRUB_NET_MAX_LINK_ADDRESS_SIZE)
|
||||||
|
{
|
||||||
|
- case GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET:
|
||||||
|
- return grub_memcmp (a->mac, b->mac, sizeof (a->mac));
|
||||||
|
+ grub_printf (_("Unsupported hw address type %d len %d\n"),
|
||||||
|
+ a->type, a->len);
|
||||||
|
+ return + 1;
|
||||||
|
}
|
||||||
|
- grub_printf (_("Unsupported hw address type %d\n"), a->type);
|
||||||
|
- return 1;
|
||||||
|
+ return grub_memcmp (a->mac, b->mac, a->len);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
||||||
|
index 8a05ec4fe7a..af0404db7e3 100644
|
||||||
|
--- a/include/grub/net.h
|
||||||
|
+++ b/include/grub/net.h
|
||||||
|
@@ -29,7 +29,8 @@
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
- GRUB_NET_MAX_LINK_HEADER_SIZE = 64,
|
||||||
|
+ GRUB_NET_MAX_LINK_HEADER_SIZE = 96,
|
||||||
|
+ GRUB_NET_MAX_LINK_ADDRESS_SIZE = 32,
|
||||||
|
GRUB_NET_UDP_HEADER_SIZE = 8,
|
||||||
|
GRUB_NET_TCP_HEADER_SIZE = 20,
|
||||||
|
GRUB_NET_OUR_IPV4_HEADER_SIZE = 20,
|
||||||
|
@@ -42,15 +43,17 @@ enum
|
||||||
|
|
||||||
|
typedef enum grub_link_level_protocol_id
|
||||||
|
{
|
||||||
|
- GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
|
||||||
|
+ /* IANA ARP constant to define hardware type. */
|
||||||
|
+ GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET = 1,
|
||||||
|
} grub_link_level_protocol_id_t;
|
||||||
|
|
||||||
|
typedef struct grub_net_link_level_address
|
||||||
|
{
|
||||||
|
grub_link_level_protocol_id_t type;
|
||||||
|
+ grub_uint8_t len;
|
||||||
|
union
|
||||||
|
{
|
||||||
|
- grub_uint8_t mac[6];
|
||||||
|
+ grub_uint8_t mac[GRUB_NET_MAX_LINK_ADDRESS_SIZE];
|
||||||
|
};
|
||||||
|
} grub_net_link_level_address_t;
|
||||||
|
|
||||||
|
@@ -566,11 +569,13 @@ grub_net_addr_cmp (const grub_net_network_level_address_t *a,
|
||||||
|
#define GRUB_NET_MAX_STR_ADDR_LEN sizeof ("XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX")
|
||||||
|
|
||||||
|
/*
|
||||||
|
- Currently suppoerted adresses:
|
||||||
|
- ethernet: XX:XX:XX:XX:XX:XX
|
||||||
|
+ Up to 32 byte hardware address supported, see GRUB_NET_MAX_LINK_ADDRESS_SIZE
|
||||||
|
*/
|
||||||
|
-
|
||||||
|
-#define GRUB_NET_MAX_STR_HWADDR_LEN (sizeof ("XX:XX:XX:XX:XX:XX"))
|
||||||
|
+#define GRUB_NET_MAX_STR_HWADDR_LEN (sizeof (\
|
||||||
|
+ "XX:XX:XX:XX:XX:XX:XX:XX:"\
|
||||||
|
+ "XX:XX:XX:XX:XX:XX:XX:XX:"\
|
||||||
|
+ "XX:XX:XX:XX:XX:XX:XX:XX:"\
|
||||||
|
+ "XX:XX:XX:XX:XX:XX:XX:XX"))
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_net_addr_to_str (const grub_net_network_level_address_t *target,
|
||||||
@ -0,0 +1,270 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Aaron Miller <aaronmiller@fb.com>
|
||||||
|
Date: Fri, 29 Jul 2016 17:41:38 +0800
|
||||||
|
Subject: [PATCH] net: read bracketed ipv6 addrs and port numbers
|
||||||
|
|
||||||
|
Allow specifying port numbers for http and tftp paths, and allow ipv6 addresses
|
||||||
|
to be recognized with brackets around them, which is required to specify a port
|
||||||
|
number
|
||||||
|
|
||||||
|
Signed-off-by: Aaron Miller <aaronmiller@fb.com>
|
||||||
|
[pjones: various bug fixes]
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
grub-core/net/http.c | 25 ++++++++++++---
|
||||||
|
grub-core/net/net.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
||||||
|
grub-core/net/tftp.c | 8 +++--
|
||||||
|
include/grub/net.h | 1 +
|
||||||
|
4 files changed, 109 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
|
||||||
|
index b616cf40b1e..12a2632ea55 100644
|
||||||
|
--- a/grub-core/net/http.c
|
||||||
|
+++ b/grub-core/net/http.c
|
||||||
|
@@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
|
||||||
|
nb2 = grub_netbuff_alloc (data->chunk_rem);
|
||||||
|
if (!nb2)
|
||||||
|
return grub_errno;
|
||||||
|
- grub_netbuff_put (nb2, data->chunk_rem);
|
||||||
|
+ err = grub_netbuff_put (nb2, data->chunk_rem);
|
||||||
|
+ if (err)
|
||||||
|
+ return grub_errno;
|
||||||
|
grub_memcpy (nb2->data, nb->data, data->chunk_rem);
|
||||||
|
if (file->device->net->packs.count >= 20)
|
||||||
|
{
|
||||||
|
@@ -312,12 +314,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
||||||
|
int i;
|
||||||
|
struct grub_net_buff *nb;
|
||||||
|
grub_err_t err;
|
||||||
|
+ char* server = file->device->net->server;
|
||||||
|
+ int port = file->device->net->port;
|
||||||
|
|
||||||
|
nb = grub_netbuff_alloc (GRUB_NET_TCP_RESERVE_SIZE
|
||||||
|
+ sizeof ("GET ") - 1
|
||||||
|
+ grub_strlen (data->filename)
|
||||||
|
+ sizeof (" HTTP/1.1\r\nHost: ") - 1
|
||||||
|
- + grub_strlen (file->device->net->server)
|
||||||
|
+ + grub_strlen (server) + sizeof (":XXXXXXXXXX")
|
||||||
|
+ sizeof ("\r\nUser-Agent: " PACKAGE_STRING
|
||||||
|
"\r\n") - 1
|
||||||
|
+ sizeof ("Range: bytes=XXXXXXXXXXXXXXXXXXXX"
|
||||||
|
@@ -356,7 +360,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
||||||
|
sizeof (" HTTP/1.1\r\nHost: ") - 1);
|
||||||
|
|
||||||
|
ptr = nb->tail;
|
||||||
|
- err = grub_netbuff_put (nb, grub_strlen (file->device->net->server));
|
||||||
|
+ err = grub_netbuff_put (nb, grub_strlen (server));
|
||||||
|
if (err)
|
||||||
|
{
|
||||||
|
grub_netbuff_free (nb);
|
||||||
|
@@ -365,6 +369,15 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
||||||
|
grub_memcpy (ptr, file->device->net->server,
|
||||||
|
grub_strlen (file->device->net->server));
|
||||||
|
|
||||||
|
+ if (port)
|
||||||
|
+ {
|
||||||
|
+ ptr = nb->tail;
|
||||||
|
+ grub_snprintf ((char *) ptr,
|
||||||
|
+ sizeof (":XXXXXXXXXX"),
|
||||||
|
+ ":%d",
|
||||||
|
+ port);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ptr = nb->tail;
|
||||||
|
err = grub_netbuff_put (nb,
|
||||||
|
sizeof ("\r\nUser-Agent: " PACKAGE_STRING "\r\n")
|
||||||
|
@@ -390,8 +403,10 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
||||||
|
grub_netbuff_put (nb, 2);
|
||||||
|
grub_memcpy (ptr, "\r\n", 2);
|
||||||
|
|
||||||
|
- data->sock = grub_net_tcp_open (file->device->net->server,
|
||||||
|
- HTTP_PORT, http_receive,
|
||||||
|
+ grub_dprintf ("http", "opening path %s on host %s TCP port %d\n",
|
||||||
|
+ data->filename, server, port ? port : HTTP_PORT);
|
||||||
|
+ data->sock = grub_net_tcp_open (server,
|
||||||
|
+ port ? port : HTTP_PORT, http_receive,
|
||||||
|
http_err, NULL,
|
||||||
|
file);
|
||||||
|
if (!data->sock)
|
||||||
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
||||||
|
index a46f82362ed..0ce5e675ed7 100644
|
||||||
|
--- a/grub-core/net/net.c
|
||||||
|
+++ b/grub-core/net/net.c
|
||||||
|
@@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
|
||||||
|
grub_uint16_t newip[8];
|
||||||
|
const char *ptr = val;
|
||||||
|
int word, quaddot = -1;
|
||||||
|
+ int bracketed = 0;
|
||||||
|
+
|
||||||
|
+ if (ptr[0] == '[')
|
||||||
|
+ {
|
||||||
|
+ bracketed = 1;
|
||||||
|
+ ptr++;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (ptr[0] == ':' && ptr[1] != ':')
|
||||||
|
return 0;
|
||||||
|
@@ -482,6 +489,8 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
|
||||||
|
grub_memset (&newip[quaddot], 0, (7 - word) * sizeof (newip[0]));
|
||||||
|
}
|
||||||
|
grub_memcpy (ip, newip, 16);
|
||||||
|
+ if (bracketed && *ptr == ']')
|
||||||
|
+ ptr++;
|
||||||
|
if (rest)
|
||||||
|
*rest = ptr;
|
||||||
|
return 1;
|
||||||
|
@@ -1343,8 +1352,10 @@ grub_net_open_real (const char *name)
|
||||||
|
{
|
||||||
|
grub_net_app_level_t proto;
|
||||||
|
const char *protname, *server;
|
||||||
|
+ char *host;
|
||||||
|
grub_size_t protnamelen;
|
||||||
|
int try;
|
||||||
|
+ int port = 0;
|
||||||
|
|
||||||
|
if (grub_strncmp (name, "pxe:", sizeof ("pxe:") - 1) == 0)
|
||||||
|
{
|
||||||
|
@@ -1382,6 +1393,72 @@ grub_net_open_real (const char *name)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ char* port_start;
|
||||||
|
+ /* ipv6 or port specified? */
|
||||||
|
+ if ((port_start = grub_strchr (server, ':')))
|
||||||
|
+ {
|
||||||
|
+ char* ipv6_begin;
|
||||||
|
+ if((ipv6_begin = grub_strchr (server, '[')))
|
||||||
|
+ {
|
||||||
|
+ char* ipv6_end = grub_strchr (server, ']');
|
||||||
|
+ if(!ipv6_end)
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
||||||
|
+ N_("mismatched [ in address"));
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ /* port number after bracketed ipv6 addr */
|
||||||
|
+ if(ipv6_end[1] == ':')
|
||||||
|
+ {
|
||||||
|
+ port = grub_strtoul (ipv6_end + 2, NULL, 10);
|
||||||
|
+ if(port > 65535)
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
||||||
|
+ N_("bad port number"));
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ host = grub_strndup (ipv6_begin, (ipv6_end - ipv6_begin) + 1);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ if (grub_strchr (port_start + 1, ':'))
|
||||||
|
+ {
|
||||||
|
+ int iplen = grub_strlen (server);
|
||||||
|
+ /* bracket bare ipv6 addrs */
|
||||||
|
+ host = grub_malloc (iplen + 3);
|
||||||
|
+ if(!host)
|
||||||
|
+ {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ host[0] = '[';
|
||||||
|
+ grub_memcpy (host + 1, server, iplen);
|
||||||
|
+ host[iplen + 1] = ']';
|
||||||
|
+ host[iplen + 2] = '\0';
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ /* hostname:port or ipv4:port */
|
||||||
|
+ port = grub_strtol (port_start + 1, NULL, 10);
|
||||||
|
+ if(port > 65535)
|
||||||
|
+ {
|
||||||
|
+ grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
||||||
|
+ N_("bad port number"));
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ host = grub_strndup (server, port_start - server);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ host = grub_strdup (server);
|
||||||
|
+ }
|
||||||
|
+ if (!host)
|
||||||
|
+ {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
for (try = 0; try < 2; try++)
|
||||||
|
{
|
||||||
|
FOR_NET_APP_LEVEL (proto)
|
||||||
|
@@ -1391,14 +1468,13 @@ grub_net_open_real (const char *name)
|
||||||
|
{
|
||||||
|
grub_net_t ret = grub_zalloc (sizeof (*ret));
|
||||||
|
if (!ret)
|
||||||
|
- return NULL;
|
||||||
|
- ret->protocol = proto;
|
||||||
|
- ret->server = grub_strdup (server);
|
||||||
|
- if (!ret->server)
|
||||||
|
{
|
||||||
|
- grub_free (ret);
|
||||||
|
+ grub_free (host);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
+ ret->protocol = proto;
|
||||||
|
+ ret->port = port;
|
||||||
|
+ ret->server = host;
|
||||||
|
ret->fs = &grub_net_fs;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@@ -1473,6 +1549,7 @@ grub_net_open_real (const char *name)
|
||||||
|
grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("disk `%s' not found"),
|
||||||
|
name);
|
||||||
|
|
||||||
|
+ grub_free (host);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
|
||||||
|
index 4ab2f5c7357..d54b13f09ff 100644
|
||||||
|
--- a/grub-core/net/tftp.c
|
||||||
|
+++ b/grub-core/net/tftp.c
|
||||||
|
@@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename)
|
||||||
|
grub_err_t err;
|
||||||
|
grub_uint8_t *nbd;
|
||||||
|
grub_net_network_level_address_t addr;
|
||||||
|
+ int port = file->device->net->port;
|
||||||
|
|
||||||
|
data = grub_zalloc (sizeof (*data));
|
||||||
|
if (!data)
|
||||||
|
@@ -362,14 +363,17 @@ tftp_open (struct grub_file *file, const char *filename)
|
||||||
|
err = grub_net_resolve_address (file->device->net->server, &addr);
|
||||||
|
if (err)
|
||||||
|
{
|
||||||
|
- grub_dprintf("tftp", "Address resolution failed: %d\n", err);
|
||||||
|
+ grub_dprintf ("tftp", "Address resolution failed: %d\n", err);
|
||||||
|
+ grub_dprintf ("tftp", "file_size is %llu, block_size is %llu\n",
|
||||||
|
+ (unsigned long long)data->file_size,
|
||||||
|
+ (unsigned long long)data->block_size);
|
||||||
|
grub_free (data);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
grub_dprintf("tftp", "opening connection\n");
|
||||||
|
data->sock = grub_net_udp_open (addr,
|
||||||
|
- TFTP_SERVER_PORT, tftp_receive,
|
||||||
|
+ port ? port : TFTP_SERVER_PORT, tftp_receive,
|
||||||
|
file);
|
||||||
|
if (!data->sock)
|
||||||
|
{
|
||||||
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
||||||
|
index af0404db7e3..d55d505a03a 100644
|
||||||
|
--- a/include/grub/net.h
|
||||||
|
+++ b/include/grub/net.h
|
||||||
|
@@ -273,6 +273,7 @@ typedef struct grub_net
|
||||||
|
{
|
||||||
|
char *server;
|
||||||
|
char *name;
|
||||||
|
+ int port;
|
||||||
|
grub_net_app_level_t protocol;
|
||||||
|
grub_net_packets_t packs;
|
||||||
|
grub_off_t offset;
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,126 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Wed, 15 Apr 2015 14:48:30 +0800
|
||||||
|
Subject: [PATCH] efinet: UEFI IPv6 PXE support
|
||||||
|
|
||||||
|
When grub2 image is booted from UEFI IPv6 PXE, the DHCPv6 Reply packet is
|
||||||
|
cached in firmware buffer which can be obtained by PXE Base Code protocol. The
|
||||||
|
network interface can be setup through the parameters in that obtained packet.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
||||||
|
---
|
||||||
|
grub-core/net/drivers/efi/efinet.c | 2 ++
|
||||||
|
include/grub/efi/api.h | 71 +++++++++++++++++++++++---------------
|
||||||
|
2 files changed, 46 insertions(+), 27 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
index 8e25680db0c..014e5bf9802 100644
|
||||||
|
--- a/grub-core/net/drivers/efi/efinet.c
|
||||||
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
@@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
grub_print_error ();
|
||||||
|
if (device && path)
|
||||||
|
grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
|
||||||
|
+ if (grub_errno)
|
||||||
|
+ grub_print_error ();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
||||||
|
index 7614b58dca8..91ab528e4d0 100644
|
||||||
|
--- a/include/grub/efi/api.h
|
||||||
|
+++ b/include/grub/efi/api.h
|
||||||
|
@@ -1524,31 +1524,6 @@ typedef union
|
||||||
|
grub_efi_pxe_dhcpv6_packet_t dhcpv6;
|
||||||
|
} grub_efi_pxe_packet_t;
|
||||||
|
|
||||||
|
-#define GRUB_EFI_PXE_MAX_IPCNT 8
|
||||||
|
-#define GRUB_EFI_PXE_MAX_ARP_ENTRIES 8
|
||||||
|
-#define GRUB_EFI_PXE_MAX_ROUTE_ENTRIES 8
|
||||||
|
-
|
||||||
|
-typedef struct grub_efi_pxe_ip_filter
|
||||||
|
-{
|
||||||
|
- grub_efi_uint8_t filters;
|
||||||
|
- grub_efi_uint8_t ip_count;
|
||||||
|
- grub_efi_uint16_t reserved;
|
||||||
|
- grub_efi_ip_address_t ip_list[GRUB_EFI_PXE_MAX_IPCNT];
|
||||||
|
-} grub_efi_pxe_ip_filter_t;
|
||||||
|
-
|
||||||
|
-typedef struct grub_efi_pxe_arp_entry
|
||||||
|
-{
|
||||||
|
- grub_efi_ip_address_t ip_addr;
|
||||||
|
- grub_efi_mac_address_t mac_addr;
|
||||||
|
-} grub_efi_pxe_arp_entry_t;
|
||||||
|
-
|
||||||
|
-typedef struct grub_efi_pxe_route_entry
|
||||||
|
-{
|
||||||
|
- grub_efi_ip_address_t ip_addr;
|
||||||
|
- grub_efi_ip_address_t subnet_mask;
|
||||||
|
- grub_efi_ip_address_t gateway_addr;
|
||||||
|
-} grub_efi_pxe_route_entry_t;
|
||||||
|
-
|
||||||
|
typedef struct grub_efi_pxe_icmp_error
|
||||||
|
{
|
||||||
|
grub_efi_uint8_t type;
|
||||||
|
@@ -1574,6 +1549,48 @@ typedef struct grub_efi_pxe_tftp_error
|
||||||
|
grub_efi_char8_t error_string[127];
|
||||||
|
} grub_efi_pxe_tftp_error_t;
|
||||||
|
|
||||||
|
+typedef struct {
|
||||||
|
+ grub_uint8_t addr[4];
|
||||||
|
+} grub_efi_pxe_ipv4_address_t;
|
||||||
|
+
|
||||||
|
+typedef struct {
|
||||||
|
+ grub_uint8_t addr[16];
|
||||||
|
+} grub_efi_pxe_ipv6_address_t;
|
||||||
|
+
|
||||||
|
+typedef struct {
|
||||||
|
+ grub_uint8_t addr[32];
|
||||||
|
+} grub_efi_pxe_mac_address_t;
|
||||||
|
+
|
||||||
|
+typedef union {
|
||||||
|
+ grub_uint32_t addr[4];
|
||||||
|
+ grub_efi_pxe_ipv4_address_t v4;
|
||||||
|
+ grub_efi_pxe_ipv6_address_t v6;
|
||||||
|
+} grub_efi_pxe_ip_address_t;
|
||||||
|
+
|
||||||
|
+#define GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT 8
|
||||||
|
+typedef struct grub_efi_pxe_ip_filter
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint8_t filters;
|
||||||
|
+ grub_efi_uint8_t ip_count;
|
||||||
|
+ grub_efi_uint16_t reserved;
|
||||||
|
+ grub_efi_ip_address_t ip_list[GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT];
|
||||||
|
+} grub_efi_pxe_ip_filter_t;
|
||||||
|
+
|
||||||
|
+typedef struct {
|
||||||
|
+ grub_efi_pxe_ip_address_t ip_addr;
|
||||||
|
+ grub_efi_pxe_mac_address_t mac_addr;
|
||||||
|
+} grub_efi_pxe_arp_entry_t;
|
||||||
|
+
|
||||||
|
+typedef struct {
|
||||||
|
+ grub_efi_pxe_ip_address_t ip_addr;
|
||||||
|
+ grub_efi_pxe_ip_address_t subnet_mask;
|
||||||
|
+ grub_efi_pxe_ip_address_t gw_addr;
|
||||||
|
+} grub_efi_pxe_route_entry_t;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#define GRUB_EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES 8
|
||||||
|
+#define GRUB_EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES 8
|
||||||
|
+
|
||||||
|
typedef struct grub_efi_pxe_mode
|
||||||
|
{
|
||||||
|
grub_efi_boolean_t started;
|
||||||
|
@@ -1605,9 +1622,9 @@ typedef struct grub_efi_pxe_mode
|
||||||
|
grub_efi_pxe_packet_t pxe_bis_reply;
|
||||||
|
grub_efi_pxe_ip_filter_t ip_filter;
|
||||||
|
grub_efi_uint32_t arp_cache_entries;
|
||||||
|
- grub_efi_pxe_arp_entry_t arp_cache[GRUB_EFI_PXE_MAX_ARP_ENTRIES];
|
||||||
|
+ grub_efi_pxe_arp_entry_t arp_cache[GRUB_EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES];
|
||||||
|
grub_efi_uint32_t route_table_entries;
|
||||||
|
- grub_efi_pxe_route_entry_t route_table[GRUB_EFI_PXE_MAX_ROUTE_ENTRIES];
|
||||||
|
+ grub_efi_pxe_route_entry_t route_table[GRUB_EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES];
|
||||||
|
grub_efi_pxe_icmp_error_t icmp_error;
|
||||||
|
grub_efi_pxe_tftp_error_t tftp_error;
|
||||||
|
} grub_efi_pxe_mode_t;
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Tue, 5 May 2015 14:19:24 +0800
|
||||||
|
Subject: [PATCH] grub.texi: Add net_bootp6 doument
|
||||||
|
|
||||||
|
Update grub documentation for net_bootp6 command.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
||||||
|
---
|
||||||
|
docs/grub.texi | 17 +++++++++++++++++
|
||||||
|
1 file changed, 17 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/docs/grub.texi b/docs/grub.texi
|
||||||
|
index 0615d0ed97e..04ed6ac1f07 100644
|
||||||
|
--- a/docs/grub.texi
|
||||||
|
+++ b/docs/grub.texi
|
||||||
|
@@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems.
|
||||||
|
* net_add_dns:: Add a DNS server
|
||||||
|
* net_add_route:: Add routing entry
|
||||||
|
* net_bootp:: Perform a bootp/DHCP autoconfiguration
|
||||||
|
+* net_bootp6:: Perform a DHCPv6 autoconfiguration
|
||||||
|
* net_del_addr:: Remove IP address from interface
|
||||||
|
* net_del_dns:: Remove a DNS server
|
||||||
|
* net_del_route:: Remove a route entry
|
||||||
|
@@ -5611,6 +5612,22 @@ Sets environment variable @samp{net_}@var{<card>}@samp{_boot_file}
|
||||||
|
|
||||||
|
@end deffn
|
||||||
|
|
||||||
|
+@node net_bootp6
|
||||||
|
+@subsection net_bootp6
|
||||||
|
+
|
||||||
|
+@deffn Command net_bootp6 [@var{card}]
|
||||||
|
+Perform configuration of @var{card} using DHCPv6 protocol. If no card name is
|
||||||
|
+specified, try to configure all existing cards. If configuration was
|
||||||
|
+successful, interface with name @var{card}@samp{:dhcp6} and configured address
|
||||||
|
+is added to @var{card}.
|
||||||
|
+
|
||||||
|
+@table @samp
|
||||||
|
+@item 1 (Domain Name Server)
|
||||||
|
+Adds all servers from option value to the list of servers used during name
|
||||||
|
+resolution.
|
||||||
|
+@end table
|
||||||
|
+
|
||||||
|
+@end deffn
|
||||||
|
|
||||||
|
@node net_get_dhcp_option
|
||||||
|
@subsection net_get_dhcp_option
|
||||||
@ -0,0 +1,108 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Wed, 10 Jul 2019 23:58:28 +0200
|
||||||
|
Subject: [PATCH] bootp: Add processing DHCPACK packet from HTTP Boot
|
||||||
|
|
||||||
|
The vendor class identifier with the string "HTTPClient" is used to denote the
|
||||||
|
packet as responding to HTTP boot request. In DHCP4 config, the filename for
|
||||||
|
HTTP boot is the URL of the boot file while for PXE boot it is the path to the
|
||||||
|
boot file. As a consequence, the next-server becomes obseleted because the HTTP
|
||||||
|
URL already contains the server address for the boot file. For DHCP6 config,
|
||||||
|
there's no difference definition in existing config as dhcp6.bootfile-url can
|
||||||
|
be used to specify URL for both HTTP and PXE boot file.
|
||||||
|
|
||||||
|
This patch adds processing for "HTTPClient" vendor class identifier in DHCPACK
|
||||||
|
packet by treating it as HTTP format, not as the PXE format.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
||||||
|
---
|
||||||
|
grub-core/net/bootp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
include/grub/net.h | 1 +
|
||||||
|
2 files changed, 56 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
||||||
|
index fe93b80f1cf..8fb8918ae7e 100644
|
||||||
|
--- a/grub-core/net/bootp.c
|
||||||
|
+++ b/grub-core/net/bootp.c
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
#include <grub/env.h>
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/command.h>
|
||||||
|
+#include <grub/net.h>
|
||||||
|
#include <grub/net/ip.h>
|
||||||
|
#include <grub/net/netbuff.h>
|
||||||
|
#include <grub/net/udp.h>
|
||||||
|
@@ -500,6 +501,60 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
||||||
|
if (opt && opt_len)
|
||||||
|
grub_env_set_net_property (name, "rootpath", (const char *) opt, opt_len);
|
||||||
|
|
||||||
|
+ opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER, &opt_len);
|
||||||
|
+ if (opt && opt_len)
|
||||||
|
+ {
|
||||||
|
+ grub_env_set_net_property (name, "vendor_class_identifier", (const char *) opt, opt_len);
|
||||||
|
+ if (opt && grub_strcmp (opt, "HTTPClient") == 0)
|
||||||
|
+ {
|
||||||
|
+ char *proto, *ip, *pa;
|
||||||
|
+
|
||||||
|
+ if (!dissect_url (bp->boot_file, &proto, &ip, &pa))
|
||||||
|
+ return inter;
|
||||||
|
+
|
||||||
|
+ grub_env_set_net_property (name, "boot_file", pa, grub_strlen (pa));
|
||||||
|
+ if (is_def)
|
||||||
|
+ {
|
||||||
|
+ grub_net_default_server = grub_strdup (ip);
|
||||||
|
+ grub_env_set ("net_default_interface", name);
|
||||||
|
+ grub_env_export ("net_default_interface");
|
||||||
|
+ }
|
||||||
|
+ if (device && !*device)
|
||||||
|
+ {
|
||||||
|
+ *device = grub_xasprintf ("%s,%s", proto, ip);
|
||||||
|
+ grub_print_error ();
|
||||||
|
+ }
|
||||||
|
+ if (path)
|
||||||
|
+ {
|
||||||
|
+ *path = grub_strdup (pa);
|
||||||
|
+ grub_print_error ();
|
||||||
|
+ if (*path)
|
||||||
|
+ {
|
||||||
|
+ char *slash;
|
||||||
|
+ slash = grub_strrchr (*path, '/');
|
||||||
|
+ if (slash)
|
||||||
|
+ *slash = 0;
|
||||||
|
+ else
|
||||||
|
+ **path = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ grub_net_add_ipv4_local (inter, mask);
|
||||||
|
+ inter->dhcp_ack = grub_malloc (size);
|
||||||
|
+ if (inter->dhcp_ack)
|
||||||
|
+ {
|
||||||
|
+ grub_memcpy (inter->dhcp_ack, bp, size);
|
||||||
|
+ inter->dhcp_acklen = size;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ grub_errno = GRUB_ERR_NONE;
|
||||||
|
+
|
||||||
|
+ grub_free (proto);
|
||||||
|
+ grub_free (ip);
|
||||||
|
+ grub_free (pa);
|
||||||
|
+ return inter;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_EXTENSIONS_PATH, &opt_len);
|
||||||
|
if (opt && opt_len)
|
||||||
|
grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len);
|
||||||
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
||||||
|
index 543251f7273..42af7de250a 100644
|
||||||
|
--- a/include/grub/net.h
|
||||||
|
+++ b/include/grub/net.h
|
||||||
|
@@ -531,6 +531,7 @@ enum
|
||||||
|
GRUB_NET_DHCP_MESSAGE_TYPE = 53,
|
||||||
|
GRUB_NET_DHCP_SERVER_IDENTIFIER = 54,
|
||||||
|
GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55,
|
||||||
|
+ GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER = 60,
|
||||||
|
GRUB_NET_BOOTP_CLIENT_ID = 61,
|
||||||
|
GRUB_NET_DHCP_TFTP_SERVER_NAME = 66,
|
||||||
|
GRUB_NET_DHCP_BOOTFILE_NAME = 67,
|
||||||
@ -0,0 +1,405 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Sun, 10 Jul 2016 23:46:31 +0800
|
||||||
|
Subject: [PATCH] efinet: Setting network from UEFI device path
|
||||||
|
|
||||||
|
The PXE Base Code protocol used to obtain cached PXE DHCPACK packet is no
|
||||||
|
longer provided for HTTP Boot. Instead, we have to get the HTTP boot
|
||||||
|
information from the device path nodes defined in following UEFI Specification
|
||||||
|
sections.
|
||||||
|
|
||||||
|
9.3.5.12 IPv4 Device Path
|
||||||
|
9.3.5.13 IPv6 Device Path
|
||||||
|
9.3.5.23 Uniform Resource Identifiers (URI) Device Path
|
||||||
|
|
||||||
|
This patch basically does:
|
||||||
|
|
||||||
|
include/grub/efi/api.h:
|
||||||
|
Add new structure of Uniform Resource Identifiers (URI) Device Path
|
||||||
|
|
||||||
|
grub-core/net/drivers/efi/efinet.c:
|
||||||
|
Check if PXE Base Code is available, if not it will try to obtain the netboot
|
||||||
|
information from the device path where the image booted from. The DHCPACK
|
||||||
|
packet is recoverd from the information in device patch and feed into the same
|
||||||
|
DHCP packet processing functions to ensure the network interface is setting up
|
||||||
|
the same way it used to be.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
||||||
|
---
|
||||||
|
grub-core/net/drivers/efi/efinet.c | 284 +++++++++++++++++++++++++++++++++++--
|
||||||
|
include/grub/efi/api.h | 11 ++
|
||||||
|
2 files changed, 280 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
index 014e5bf9802..8171ecaa5e4 100644
|
||||||
|
--- a/grub-core/net/drivers/efi/efinet.c
|
||||||
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/lib/hexdump.h>
|
||||||
|
#include <grub/types.h>
|
||||||
|
+#include <grub/net/netbuff.h>
|
||||||
|
|
||||||
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
@@ -331,6 +332,227 @@ grub_efinet_findcards (void)
|
||||||
|
grub_free (handles);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static struct grub_net_buff *
|
||||||
|
+grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *use_ipv6)
|
||||||
|
+{
|
||||||
|
+ grub_efi_uint16_t uri_len;
|
||||||
|
+ grub_efi_device_path_t *ldp, *ddp;
|
||||||
|
+ grub_efi_uri_device_path_t *uri_dp;
|
||||||
|
+ struct grub_net_buff *nb;
|
||||||
|
+ grub_err_t err;
|
||||||
|
+
|
||||||
|
+ ddp = grub_efi_duplicate_device_path (dp);
|
||||||
|
+ if (!ddp)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
+ ldp = grub_efi_find_last_device_path (ddp);
|
||||||
|
+
|
||||||
|
+ if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
|
||||||
|
+ || GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_URI_DEVICE_PATH_SUBTYPE)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ uri_len = GRUB_EFI_DEVICE_PATH_LENGTH (ldp) > 4 ? GRUB_EFI_DEVICE_PATH_LENGTH (ldp) - 4 : 0;
|
||||||
|
+
|
||||||
|
+ if (!uri_len)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ uri_dp = (grub_efi_uri_device_path_t *) ldp;
|
||||||
|
+
|
||||||
|
+ ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
||||||
|
+ ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
||||||
|
+ ldp->length = sizeof (*ldp);
|
||||||
|
+
|
||||||
|
+ ldp = grub_efi_find_last_device_path (ddp);
|
||||||
|
+
|
||||||
|
+ if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
|
||||||
|
+ || (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
|
||||||
|
+ && GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ nb = grub_netbuff_alloc (512);
|
||||||
|
+ if (!nb)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) == GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE)
|
||||||
|
+ {
|
||||||
|
+ grub_efi_ipv4_device_path_t *ipv4 = (grub_efi_ipv4_device_path_t *) ldp;
|
||||||
|
+ struct grub_net_bootp_packet *bp;
|
||||||
|
+ grub_uint8_t *ptr;
|
||||||
|
+
|
||||||
|
+ bp = (struct grub_net_bootp_packet *) nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof (*bp) + 4);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (sizeof(bp->boot_file) < uri_len)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ grub_memcpy (bp->boot_file, uri_dp->uri, uri_len);
|
||||||
|
+ grub_memcpy (&bp->your_ip, ipv4->local_ip_address, sizeof (bp->your_ip));
|
||||||
|
+ grub_memcpy (&bp->server_ip, ipv4->remote_ip_address, sizeof (bp->server_ip));
|
||||||
|
+
|
||||||
|
+ bp->vendor[0] = GRUB_NET_BOOTP_RFC1048_MAGIC_0;
|
||||||
|
+ bp->vendor[1] = GRUB_NET_BOOTP_RFC1048_MAGIC_1;
|
||||||
|
+ bp->vendor[2] = GRUB_NET_BOOTP_RFC1048_MAGIC_2;
|
||||||
|
+ bp->vendor[3] = GRUB_NET_BOOTP_RFC1048_MAGIC_3;
|
||||||
|
+
|
||||||
|
+ ptr = nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof (ipv4->subnet_mask) + 2);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ *ptr++ = GRUB_NET_BOOTP_NETMASK;
|
||||||
|
+ *ptr++ = sizeof (ipv4->subnet_mask);
|
||||||
|
+ grub_memcpy (ptr, ipv4->subnet_mask, sizeof (ipv4->subnet_mask));
|
||||||
|
+
|
||||||
|
+ ptr = nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof (ipv4->gateway_ip_address) + 2);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ *ptr++ = GRUB_NET_BOOTP_ROUTER;
|
||||||
|
+ *ptr++ = sizeof (ipv4->gateway_ip_address);
|
||||||
|
+ grub_memcpy (ptr, ipv4->gateway_ip_address, sizeof (ipv4->gateway_ip_address));
|
||||||
|
+
|
||||||
|
+ ptr = nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof ("HTTPClient") + 1);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ *ptr++ = GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER;
|
||||||
|
+ *ptr++ = sizeof ("HTTPClient") - 1;
|
||||||
|
+ grub_memcpy (ptr, "HTTPClient", sizeof ("HTTPClient") - 1);
|
||||||
|
+
|
||||||
|
+ ptr = nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, 1);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ *ptr = GRUB_NET_BOOTP_END;
|
||||||
|
+ *use_ipv6 = 0;
|
||||||
|
+
|
||||||
|
+ ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
||||||
|
+ ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
||||||
|
+ ldp->length = sizeof (*ldp);
|
||||||
|
+ ldp = grub_efi_find_last_device_path (ddp);
|
||||||
|
+
|
||||||
|
+ if (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) == GRUB_EFI_MAC_ADDRESS_DEVICE_PATH_SUBTYPE)
|
||||||
|
+ {
|
||||||
|
+ grub_efi_mac_address_device_path_t *mac = (grub_efi_mac_address_device_path_t *) ldp;
|
||||||
|
+ bp->hw_type = mac->if_type;
|
||||||
|
+ bp->hw_len = sizeof (bp->mac_addr);
|
||||||
|
+ grub_memcpy (bp->mac_addr, mac->mac_address, bp->hw_len);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ grub_efi_ipv6_device_path_t *ipv6 = (grub_efi_ipv6_device_path_t *) ldp;
|
||||||
|
+
|
||||||
|
+ struct grub_net_dhcp6_packet *d6p;
|
||||||
|
+ struct grub_net_dhcp6_option *opt;
|
||||||
|
+ struct grub_net_dhcp6_option_iana *iana;
|
||||||
|
+ struct grub_net_dhcp6_option_iaaddr *iaaddr;
|
||||||
|
+
|
||||||
|
+ d6p = (struct grub_net_dhcp6_packet *)nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*d6p));
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ d6p->message_type = GRUB_NET_DHCP6_REPLY;
|
||||||
|
+
|
||||||
|
+ opt = (struct grub_net_dhcp6_option *)nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*opt));
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ opt->code = grub_cpu_to_be16_compile_time (GRUB_NET_DHCP6_OPTION_IA_NA);
|
||||||
|
+ opt->len = grub_cpu_to_be16_compile_time (sizeof(*iana) + sizeof(*opt) + sizeof(*iaaddr));
|
||||||
|
+
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*iana));
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ opt = (struct grub_net_dhcp6_option *)nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*opt));
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ opt->code = grub_cpu_to_be16_compile_time (GRUB_NET_DHCP6_OPTION_IAADDR);
|
||||||
|
+ opt->len = grub_cpu_to_be16_compile_time (sizeof (*iaaddr));
|
||||||
|
+
|
||||||
|
+ iaaddr = (struct grub_net_dhcp6_option_iaaddr *)nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*iaaddr));
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ grub_memcpy (iaaddr->addr, ipv6->local_ip_address, sizeof(ipv6->local_ip_address));
|
||||||
|
+
|
||||||
|
+ opt = (struct grub_net_dhcp6_option *)nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*opt) + uri_len);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ opt->code = grub_cpu_to_be16_compile_time (GRUB_NET_DHCP6_OPTION_BOOTFILE_URL);
|
||||||
|
+ opt->len = grub_cpu_to_be16 (uri_len);
|
||||||
|
+ grub_memcpy (opt->data, uri_dp->uri, uri_len);
|
||||||
|
+
|
||||||
|
+ *use_ipv6 = 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ return nb;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void
|
||||||
|
grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
char **path)
|
||||||
|
@@ -346,7 +568,11 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
{
|
||||||
|
grub_efi_device_path_t *cdp;
|
||||||
|
struct grub_efi_pxe *pxe;
|
||||||
|
- struct grub_efi_pxe_mode *pxe_mode;
|
||||||
|
+ struct grub_efi_pxe_mode *pxe_mode = NULL;
|
||||||
|
+ grub_uint8_t *packet_buf;
|
||||||
|
+ grub_size_t packet_bufsz ;
|
||||||
|
+ int ipv6;
|
||||||
|
+ struct grub_net_buff *nb = NULL;
|
||||||
|
|
||||||
|
if (card->driver != &efidriver)
|
||||||
|
continue;
|
||||||
|
@@ -370,11 +596,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
*/
|
||||||
|
if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) != GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE
|
||||||
|
|| (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV4_DEVICE_PATH_SUBTYPE
|
||||||
|
- && GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE))
|
||||||
|
+ && GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_IPV6_DEVICE_PATH_SUBTYPE
|
||||||
|
+ && GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) != GRUB_EFI_URI_DEVICE_PATH_SUBTYPE))
|
||||||
|
continue;
|
||||||
|
dup_dp = grub_efi_duplicate_device_path (dp);
|
||||||
|
if (!dup_dp)
|
||||||
|
continue;
|
||||||
|
+
|
||||||
|
+ if (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) == GRUB_EFI_URI_DEVICE_PATH_SUBTYPE)
|
||||||
|
+ {
|
||||||
|
+ dup_ldp = grub_efi_find_last_device_path (dup_dp);
|
||||||
|
+ dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
||||||
|
+ dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
||||||
|
+ dup_ldp->length = sizeof (*dup_ldp);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
dup_ldp = grub_efi_find_last_device_path (dup_dp);
|
||||||
|
dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
||||||
|
dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
||||||
|
@@ -387,23 +623,37 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
|
||||||
|
pxe = grub_efi_open_protocol (hnd, &pxe_io_guid,
|
||||||
|
GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||||
|
- if (! pxe)
|
||||||
|
- continue;
|
||||||
|
+ if (!pxe)
|
||||||
|
+ {
|
||||||
|
+ nb = grub_efinet_create_dhcp_ack_from_device_path (dp, &ipv6);
|
||||||
|
+ if (!nb)
|
||||||
|
+ {
|
||||||
|
+ grub_print_error ();
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ packet_buf = nb->head;
|
||||||
|
+ packet_bufsz = nb->tail - nb->head;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ pxe_mode = pxe->mode;
|
||||||
|
+ packet_buf = (grub_uint8_t *) &pxe_mode->dhcp_ack;
|
||||||
|
+ packet_bufsz = sizeof (pxe_mode->dhcp_ack);
|
||||||
|
+ ipv6 = pxe_mode->using_ipv6;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- pxe_mode = pxe->mode;
|
||||||
|
- if (pxe_mode->using_ipv6)
|
||||||
|
+ if (ipv6)
|
||||||
|
{
|
||||||
|
grub_dprintf ("efinet", "using ipv6 and dhcpv6\n");
|
||||||
|
- grub_dprintf ("efinet", "dhcp_ack_received: %s%s\n",
|
||||||
|
- pxe_mode->dhcp_ack_received ? "yes" : "no",
|
||||||
|
- pxe_mode->dhcp_ack_received ? "" : " cannot continue");
|
||||||
|
- if (!pxe_mode->dhcp_ack_received)
|
||||||
|
- continue;
|
||||||
|
+ if (pxe_mode)
|
||||||
|
+ grub_dprintf ("efinet", "dhcp_ack_received: %s%s\n",
|
||||||
|
+ pxe_mode->dhcp_ack_received ? "yes" : "no",
|
||||||
|
+ pxe_mode->dhcp_ack_received ? "" : " cannot continue");
|
||||||
|
|
||||||
|
grub_net_configure_by_dhcpv6_reply (card->name, card, 0,
|
||||||
|
(struct grub_net_dhcp6_packet *)
|
||||||
|
- &pxe_mode->dhcp_ack,
|
||||||
|
- sizeof (pxe_mode->dhcp_ack),
|
||||||
|
+ packet_buf,
|
||||||
|
+ packet_bufsz,
|
||||||
|
1, device, path);
|
||||||
|
if (grub_errno)
|
||||||
|
grub_print_error ();
|
||||||
|
@@ -417,11 +667,15 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
||||||
|
grub_dprintf ("efinet", "using ipv4 and dhcp\n");
|
||||||
|
grub_net_configure_by_dhcp_ack (card->name, card, 0,
|
||||||
|
(struct grub_net_bootp_packet *)
|
||||||
|
- &pxe_mode->dhcp_ack,
|
||||||
|
- sizeof (pxe_mode->dhcp_ack),
|
||||||
|
+ packet_buf,
|
||||||
|
+ packet_bufsz,
|
||||||
|
1, device, path);
|
||||||
|
grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (nb)
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
||||||
|
index 91ab528e4d0..4a51667adb1 100644
|
||||||
|
--- a/include/grub/efi/api.h
|
||||||
|
+++ b/include/grub/efi/api.h
|
||||||
|
@@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path
|
||||||
|
grub_efi_uint16_t remote_port;
|
||||||
|
grub_efi_uint16_t protocol;
|
||||||
|
grub_efi_uint8_t static_ip_address;
|
||||||
|
+ grub_efi_ipv4_address_t gateway_ip_address;
|
||||||
|
+ grub_efi_ipv4_address_t subnet_mask;
|
||||||
|
} GRUB_PACKED;
|
||||||
|
typedef struct grub_efi_ipv4_device_path grub_efi_ipv4_device_path_t;
|
||||||
|
|
||||||
|
@@ -918,6 +920,15 @@ struct grub_efi_sata_device_path
|
||||||
|
} GRUB_PACKED;
|
||||||
|
typedef struct grub_efi_sata_device_path grub_efi_sata_device_path_t;
|
||||||
|
|
||||||
|
+#define GRUB_EFI_URI_DEVICE_PATH_SUBTYPE 24
|
||||||
|
+
|
||||||
|
+struct grub_efi_uri_device_path
|
||||||
|
+{
|
||||||
|
+ grub_efi_device_path_t header;
|
||||||
|
+ grub_efi_uint8_t uri[0];
|
||||||
|
+} GRUB_PACKED;
|
||||||
|
+typedef struct grub_efi_uri_device_path grub_efi_uri_device_path_t;
|
||||||
|
+
|
||||||
|
#define GRUB_EFI_VENDOR_MESSAGING_DEVICE_PATH_SUBTYPE 10
|
||||||
|
|
||||||
|
/* Media Device Path. */
|
||||||
@ -0,0 +1,336 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Chang <mchang@suse.com>
|
||||||
|
Date: Thu, 14 Jul 2016 17:48:45 +0800
|
||||||
|
Subject: [PATCH] efinet: Setting DNS server from UEFI protocol
|
||||||
|
|
||||||
|
In the URI device path node, any name rahter than address can be used for
|
||||||
|
looking up the resources so that DNS service become needed to get answer of the
|
||||||
|
name's address. Unfortunately the DNS is not defined in any of the device path
|
||||||
|
nodes so that we use the EFI_IP4_CONFIG2_PROTOCOL and EFI_IP6_CONFIG_PROTOCOL
|
||||||
|
to obtain it.
|
||||||
|
|
||||||
|
These two protcols are defined the sections of UEFI specification.
|
||||||
|
|
||||||
|
27.5 EFI IPv4 Configuration II Protocol
|
||||||
|
27.7 EFI IPv6 Configuration Protocol
|
||||||
|
|
||||||
|
include/grub/efi/api.h:
|
||||||
|
Add new structure and protocol UUID of EFI_IP4_CONFIG2_PROTOCOL and
|
||||||
|
EFI_IP6_CONFIG_PROTOCOL.
|
||||||
|
|
||||||
|
grub-core/net/drivers/efi/efinet.c:
|
||||||
|
Use the EFI_IP4_CONFIG2_PROTOCOL and EFI_IP6_CONFIG_PROTOCOL to obtain the list
|
||||||
|
of DNS server address for IPv4 and IPv6 respectively. The address of DNS
|
||||||
|
servers is structured into DHCPACK packet and feed into the same DHCP packet
|
||||||
|
processing functions to ensure the network interface is setting up the same way
|
||||||
|
it used to be.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
||||||
|
---
|
||||||
|
grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++++++++++
|
||||||
|
include/grub/efi/api.h | 75 +++++++++++++++++
|
||||||
|
2 files changed, 238 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
index 8171ecaa5e4..715a6168d77 100644
|
||||||
|
--- a/grub-core/net/drivers/efi/efinet.c
|
||||||
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
||||||
|
@@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
/* GUID. */
|
||||||
|
static grub_efi_guid_t net_io_guid = GRUB_EFI_SIMPLE_NETWORK_GUID;
|
||||||
|
static grub_efi_guid_t pxe_io_guid = GRUB_EFI_PXE_GUID;
|
||||||
|
+static grub_efi_guid_t ip4_config_guid = GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID;
|
||||||
|
+static grub_efi_guid_t ip6_config_guid = GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID;
|
||||||
|
|
||||||
|
static grub_err_t
|
||||||
|
send_card_buffer (struct grub_net_card *dev,
|
||||||
|
@@ -332,6 +334,125 @@ grub_efinet_findcards (void)
|
||||||
|
grub_free (handles);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static grub_efi_handle_t
|
||||||
|
+grub_efi_locate_device_path (grub_efi_guid_t *protocol, grub_efi_device_path_t *device_path,
|
||||||
|
+ grub_efi_device_path_t **r_device_path)
|
||||||
|
+{
|
||||||
|
+ grub_efi_handle_t handle;
|
||||||
|
+ grub_efi_status_t status;
|
||||||
|
+
|
||||||
|
+ status = efi_call_3 (grub_efi_system_table->boot_services->locate_device_path,
|
||||||
|
+ protocol, &device_path, &handle);
|
||||||
|
+
|
||||||
|
+ if (status != GRUB_EFI_SUCCESS)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ if (r_device_path)
|
||||||
|
+ *r_device_path = device_path;
|
||||||
|
+
|
||||||
|
+ return handle;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_efi_ipv4_address_t *
|
||||||
|
+grub_dns_server_ip4_address (grub_efi_device_path_t *dp, grub_efi_uintn_t *num_dns)
|
||||||
|
+{
|
||||||
|
+ grub_efi_handle_t hnd;
|
||||||
|
+ grub_efi_status_t status;
|
||||||
|
+ grub_efi_ip4_config2_protocol_t *conf;
|
||||||
|
+ grub_efi_ipv4_address_t *addrs;
|
||||||
|
+ grub_efi_uintn_t data_size = 1 * sizeof (grub_efi_ipv4_address_t);
|
||||||
|
+
|
||||||
|
+ hnd = grub_efi_locate_device_path (&ip4_config_guid, dp, NULL);
|
||||||
|
+
|
||||||
|
+ if (!hnd)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ conf = grub_efi_open_protocol (hnd, &ip4_config_guid,
|
||||||
|
+ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||||
|
+
|
||||||
|
+ if (!conf)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ addrs = grub_malloc (data_size);
|
||||||
|
+ if (!addrs)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ status = efi_call_4 (conf->get_data, conf,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
|
||||||
|
+ &data_size, addrs);
|
||||||
|
+
|
||||||
|
+ if (status == GRUB_EFI_BUFFER_TOO_SMALL)
|
||||||
|
+ {
|
||||||
|
+ grub_free (addrs);
|
||||||
|
+ addrs = grub_malloc (data_size);
|
||||||
|
+ if (!addrs)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ status = efi_call_4 (conf->get_data, conf,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
|
||||||
|
+ &data_size, addrs);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (status != GRUB_EFI_SUCCESS)
|
||||||
|
+ {
|
||||||
|
+ grub_free (addrs);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ *num_dns = data_size / sizeof (grub_efi_ipv4_address_t);
|
||||||
|
+ return addrs;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static grub_efi_ipv6_address_t *
|
||||||
|
+grub_dns_server_ip6_address (grub_efi_device_path_t *dp, grub_efi_uintn_t *num_dns)
|
||||||
|
+{
|
||||||
|
+ grub_efi_handle_t hnd;
|
||||||
|
+ grub_efi_status_t status;
|
||||||
|
+ grub_efi_ip6_config_protocol_t *conf;
|
||||||
|
+ grub_efi_ipv6_address_t *addrs;
|
||||||
|
+ grub_efi_uintn_t data_size = 1 * sizeof (grub_efi_ipv6_address_t);
|
||||||
|
+
|
||||||
|
+ hnd = grub_efi_locate_device_path (&ip6_config_guid, dp, NULL);
|
||||||
|
+
|
||||||
|
+ if (!hnd)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ conf = grub_efi_open_protocol (hnd, &ip6_config_guid,
|
||||||
|
+ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
||||||
|
+
|
||||||
|
+ if (!conf)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ addrs = grub_malloc (data_size);
|
||||||
|
+ if (!addrs)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ status = efi_call_4 (conf->get_data, conf,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
|
||||||
|
+ &data_size, addrs);
|
||||||
|
+
|
||||||
|
+ if (status == GRUB_EFI_BUFFER_TOO_SMALL)
|
||||||
|
+ {
|
||||||
|
+ grub_free (addrs);
|
||||||
|
+ addrs = grub_malloc (data_size);
|
||||||
|
+ if (!addrs)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ status = efi_call_4 (conf->get_data, conf,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
|
||||||
|
+ &data_size, addrs);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (status != GRUB_EFI_SUCCESS)
|
||||||
|
+ {
|
||||||
|
+ grub_free (addrs);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ *num_dns = data_size / sizeof (grub_efi_ipv6_address_t);
|
||||||
|
+ return addrs;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static struct grub_net_buff *
|
||||||
|
grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *use_ipv6)
|
||||||
|
{
|
||||||
|
@@ -390,6 +511,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
|
||||||
|
grub_efi_ipv4_device_path_t *ipv4 = (grub_efi_ipv4_device_path_t *) ldp;
|
||||||
|
struct grub_net_bootp_packet *bp;
|
||||||
|
grub_uint8_t *ptr;
|
||||||
|
+ grub_efi_ipv4_address_t *dns;
|
||||||
|
+ grub_efi_uintn_t num_dns;
|
||||||
|
|
||||||
|
bp = (struct grub_net_bootp_packet *) nb->tail;
|
||||||
|
err = grub_netbuff_put (nb, sizeof (*bp) + 4);
|
||||||
|
@@ -451,6 +574,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
|
||||||
|
*ptr++ = sizeof ("HTTPClient") - 1;
|
||||||
|
grub_memcpy (ptr, "HTTPClient", sizeof ("HTTPClient") - 1);
|
||||||
|
|
||||||
|
+ dns = grub_dns_server_ip4_address (dp, &num_dns);
|
||||||
|
+ if (dns)
|
||||||
|
+ {
|
||||||
|
+ grub_efi_uintn_t size_dns = sizeof (*dns) * num_dns;
|
||||||
|
+
|
||||||
|
+ ptr = nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, size_dns + 2);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ *ptr++ = GRUB_NET_BOOTP_DNS;
|
||||||
|
+ *ptr++ = size_dns;
|
||||||
|
+ grub_memcpy (ptr, dns, size_dns);
|
||||||
|
+ grub_free (dns);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ptr = nb->tail;
|
||||||
|
err = grub_netbuff_put (nb, 1);
|
||||||
|
if (err)
|
||||||
|
@@ -483,6 +625,8 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
|
||||||
|
struct grub_net_dhcp6_option *opt;
|
||||||
|
struct grub_net_dhcp6_option_iana *iana;
|
||||||
|
struct grub_net_dhcp6_option_iaaddr *iaaddr;
|
||||||
|
+ grub_efi_ipv6_address_t *dns;
|
||||||
|
+ grub_efi_uintn_t num_dns;
|
||||||
|
|
||||||
|
d6p = (struct grub_net_dhcp6_packet *)nb->tail;
|
||||||
|
err = grub_netbuff_put (nb, sizeof(*d6p));
|
||||||
|
@@ -546,6 +690,25 @@ grub_efinet_create_dhcp_ack_from_device_path (grub_efi_device_path_t *dp, int *u
|
||||||
|
opt->len = grub_cpu_to_be16 (uri_len);
|
||||||
|
grub_memcpy (opt->data, uri_dp->uri, uri_len);
|
||||||
|
|
||||||
|
+ dns = grub_dns_server_ip6_address (dp, &num_dns);
|
||||||
|
+ if (dns)
|
||||||
|
+ {
|
||||||
|
+ grub_efi_uintn_t size_dns = sizeof (*dns) * num_dns;
|
||||||
|
+
|
||||||
|
+ opt = (struct grub_net_dhcp6_option *)nb->tail;
|
||||||
|
+ err = grub_netbuff_put (nb, sizeof(*opt) + size_dns);
|
||||||
|
+ if (err)
|
||||||
|
+ {
|
||||||
|
+ grub_free (ddp);
|
||||||
|
+ grub_netbuff_free (nb);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ opt->code = grub_cpu_to_be16_compile_time (GRUB_NET_DHCP6_OPTION_DNS_SERVERS);
|
||||||
|
+ opt->len = grub_cpu_to_be16 (size_dns);
|
||||||
|
+ grub_memcpy (opt->data, dns, size_dns);
|
||||||
|
+ grub_free (dns);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
*use_ipv6 = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
||||||
|
index 4a51667adb1..0b490195ad9 100644
|
||||||
|
--- a/include/grub/efi/api.h
|
||||||
|
+++ b/include/grub/efi/api.h
|
||||||
|
@@ -352,6 +352,15 @@
|
||||||
|
#define GRUB_EFI_RNG_PROTOCOL_GUID \
|
||||||
|
{ 0x3152bca5, 0xeade, 0x433d, \
|
||||||
|
{ 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44 } \
|
||||||
|
+
|
||||||
|
+#define GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID \
|
||||||
|
+ { 0x5b446ed1, 0xe30b, 0x4faa, \
|
||||||
|
+ { 0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } \
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#define GRUB_EFI_IP6_CONFIG_PROTOCOL_GUID \
|
||||||
|
+ { 0x937fe521, 0x95ae, 0x4d1a, \
|
||||||
|
+ { 0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } \
|
||||||
|
}
|
||||||
|
|
||||||
|
struct grub_efi_sal_system_table
|
||||||
|
@@ -1883,6 +1892,72 @@ struct grub_efi_rng_protocol
|
||||||
|
};
|
||||||
|
typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t;
|
||||||
|
|
||||||
|
+enum grub_efi_ip4_config2_data_type {
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_INTERFACEINFO,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_POLICY,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MANUAL_ADDRESS,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_GATEWAY,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_DNSSERVER,
|
||||||
|
+ GRUB_EFI_IP4_CONFIG2_DATA_TYPE_MAXIMUM
|
||||||
|
+};
|
||||||
|
+typedef enum grub_efi_ip4_config2_data_type grub_efi_ip4_config2_data_type_t;
|
||||||
|
+
|
||||||
|
+struct grub_efi_ip4_config2_protocol
|
||||||
|
+{
|
||||||
|
+ grub_efi_status_t (*set_data) (struct grub_efi_ip4_config2_protocol *this,
|
||||||
|
+ grub_efi_ip4_config2_data_type_t data_type,
|
||||||
|
+ grub_efi_uintn_t data_size,
|
||||||
|
+ void *data);
|
||||||
|
+
|
||||||
|
+ grub_efi_status_t (*get_data) (struct grub_efi_ip4_config2_protocol *this,
|
||||||
|
+ grub_efi_ip4_config2_data_type_t data_type,
|
||||||
|
+ grub_efi_uintn_t *data_size,
|
||||||
|
+ void *data);
|
||||||
|
+
|
||||||
|
+ grub_efi_status_t (*register_data_notify) (struct grub_efi_ip4_config2_protocol *this,
|
||||||
|
+ grub_efi_ip4_config2_data_type_t data_type,
|
||||||
|
+ grub_efi_event_t event);
|
||||||
|
+
|
||||||
|
+ grub_efi_status_t (*unregister_datanotify) (struct grub_efi_ip4_config2_protocol *this,
|
||||||
|
+ grub_efi_ip4_config2_data_type_t data_type,
|
||||||
|
+ grub_efi_event_t event);
|
||||||
|
+};
|
||||||
|
+typedef struct grub_efi_ip4_config2_protocol grub_efi_ip4_config2_protocol_t;
|
||||||
|
+
|
||||||
|
+enum grub_efi_ip6_config_data_type {
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_INTERFACEINFO,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_ALT_INTERFACEID,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_POLICY,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_DUP_ADDR_DETECT_TRANSMITS,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_MANUAL_ADDRESS,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_GATEWAY,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_DNSSERVER,
|
||||||
|
+ GRUB_EFI_IP6_CONFIG_DATA_TYPE_MAXIMUM
|
||||||
|
+};
|
||||||
|
+typedef enum grub_efi_ip6_config_data_type grub_efi_ip6_config_data_type_t;
|
||||||
|
+
|
||||||
|
+struct grub_efi_ip6_config_protocol
|
||||||
|
+{
|
||||||
|
+ grub_efi_status_t (*set_data) (struct grub_efi_ip6_config_protocol *this,
|
||||||
|
+ grub_efi_ip6_config_data_type_t data_type,
|
||||||
|
+ grub_efi_uintn_t data_size,
|
||||||
|
+ void *data);
|
||||||
|
+
|
||||||
|
+ grub_efi_status_t (*get_data) (struct grub_efi_ip6_config_protocol *this,
|
||||||
|
+ grub_efi_ip6_config_data_type_t data_type,
|
||||||
|
+ grub_efi_uintn_t *data_size,
|
||||||
|
+ void *data);
|
||||||
|
+
|
||||||
|
+ grub_efi_status_t (*register_data_notify) (struct grub_efi_ip6_config_protocol *this,
|
||||||
|
+ grub_efi_ip6_config_data_type_t data_type,
|
||||||
|
+ grub_efi_event_t event);
|
||||||
|
+
|
||||||
|
+ grub_efi_status_t (*unregister_datanotify) (struct grub_efi_ip6_config_protocol *this,
|
||||||
|
+ grub_efi_ip6_config_data_type_t data_type,
|
||||||
|
+ grub_efi_event_t event);
|
||||||
|
+};
|
||||||
|
+typedef struct grub_efi_ip6_config_protocol grub_efi_ip6_config_protocol_t;
|
||||||
|
+
|
||||||
|
#if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
|
||||||
|
|| defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \
|
||||||
|
|| defined(__riscv)
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,62 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastian Krahmer <krahmer@suse.com>
|
||||||
|
Date: Tue, 28 Nov 2017 17:24:38 +0800
|
||||||
|
Subject: [PATCH] AUDIT-0: http boot tracker bug
|
||||||
|
|
||||||
|
Fixing a memory leak in case of error, and a integer overflow, leading to a
|
||||||
|
heap overflow due to overly large chunk sizes.
|
||||||
|
|
||||||
|
We need to check against some maximum value, otherwise values like 0xffffffff
|
||||||
|
will eventually lead in the allocation functions to small sized buffers, since
|
||||||
|
the len is rounded up to the next reasonable alignment. The following memcpy
|
||||||
|
will then smash the heap, leading to RCE.
|
||||||
|
|
||||||
|
This is no big issue for pure http boot, since its going to execute an
|
||||||
|
untrusted kernel anyway, but it will break trusted boot scenarios, where only
|
||||||
|
signed code is allowed to be executed.
|
||||||
|
|
||||||
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||||
|
---
|
||||||
|
grub-core/net/efi/net.c | 4 +++-
|
||||||
|
grub-core/net/http.c | 5 ++++-
|
||||||
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
|
||||||
|
index 86bce6535d3..4bb308026ce 100644
|
||||||
|
--- a/grub-core/net/efi/net.c
|
||||||
|
+++ b/grub-core/net/efi/net.c
|
||||||
|
@@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf,
|
||||||
|
|
||||||
|
rd = efi_net_interface (read, file, chunk, sz);
|
||||||
|
|
||||||
|
- if (rd <= 0)
|
||||||
|
+ if (rd <= 0) {
|
||||||
|
+ grub_free (chunk);
|
||||||
|
return rd;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (buf)
|
||||||
|
{
|
||||||
|
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
|
||||||
|
index 12a2632ea55..b52b558d631 100644
|
||||||
|
--- a/grub-core/net/http.c
|
||||||
|
+++ b/grub-core/net/http.c
|
||||||
|
@@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
- HTTP_PORT = 80
|
||||||
|
+ HTTP_PORT = 80,
|
||||||
|
+ HTTP_MAX_CHUNK_SIZE = 0x80000000
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -78,6 +79,8 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
|
||||||
|
if (data->in_chunk_len == 2)
|
||||||
|
{
|
||||||
|
data->chunk_rem = grub_strtoul (ptr, 0, 16);
|
||||||
|
+ if (data->chunk_rem > HTTP_MAX_CHUNK_SIZE)
|
||||||
|
+ return GRUB_ERR_NET_PACKET_TOO_BIG;
|
||||||
|
grub_errno = GRUB_ERR_NONE;
|
||||||
|
if (data->chunk_rem == 0)
|
||||||
|
{
|
||||||
@ -0,0 +1,93 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Date: Mon, 4 Jun 2018 19:49:47 +0200
|
||||||
|
Subject: [PATCH] grub-editenv: Add "incr" command to increment integer value
|
||||||
|
env. variables
|
||||||
|
|
||||||
|
To be able to automatically detect if the last boot was successful,
|
||||||
|
We want to keep count of succesful / failed boots in some integer
|
||||||
|
environment variable.
|
||||||
|
|
||||||
|
This commit adds a grub-editenvt "incr" command to increment such
|
||||||
|
integer value env. variables by 1 for use from various boot scripts.
|
||||||
|
|
||||||
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
---
|
||||||
|
util/grub-editenv.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 50 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
|
||||||
|
index db6f187cc63..948eec8a114 100644
|
||||||
|
--- a/util/grub-editenv.c
|
||||||
|
+++ b/util/grub-editenv.c
|
||||||
|
@@ -53,6 +53,9 @@ static struct argp_option options[] = {
|
||||||
|
/* TRANSLATORS: "unset" is a keyword. It's a summary of "unset" subcommand. */
|
||||||
|
{N_("unset [NAME ...]"), 0, 0, OPTION_DOC|OPTION_NO_USAGE,
|
||||||
|
N_("Delete variables."), 0},
|
||||||
|
+ /* TRANSLATORS: "incr" is a keyword. It's a summary of "incr" subcommand. */
|
||||||
|
+ {N_("incr [NAME ...]"), 0, 0, OPTION_DOC|OPTION_NO_USAGE,
|
||||||
|
+ N_("Increase value of integer variables."), 0},
|
||||||
|
|
||||||
|
{0, 0, 0, OPTION_DOC, N_("Options:"), -1},
|
||||||
|
{"verbose", 'v', 0, 0, N_("print verbose messages."), 0},
|
||||||
|
@@ -253,6 +256,51 @@ unset_variables (const char *name, int argc, char *argv[])
|
||||||
|
grub_envblk_close (envblk);
|
||||||
|
}
|
||||||
|
|
||||||
|
+struct get_int_value_params {
|
||||||
|
+ char *varname;
|
||||||
|
+ int value;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+get_int_value (const char *varname, const char *value, void *hook_data)
|
||||||
|
+{
|
||||||
|
+ struct get_int_value_params *params = hook_data;
|
||||||
|
+
|
||||||
|
+ if (strcmp (varname, params->varname) == 0) {
|
||||||
|
+ params->value = strtol (value, NULL, 10);
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+incr_variables (const char *name, int argc, char *argv[])
|
||||||
|
+{
|
||||||
|
+ grub_envblk_t envblk;
|
||||||
|
+ char buf[16];
|
||||||
|
+
|
||||||
|
+ envblk = open_envblk_file (name);
|
||||||
|
+ while (argc)
|
||||||
|
+ {
|
||||||
|
+ struct get_int_value_params params = {
|
||||||
|
+ .varname = argv[0],
|
||||||
|
+ .value = 0, /* Consider unset variables 0 */
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ grub_envblk_iterate (envblk, ¶ms, get_int_value);
|
||||||
|
+ snprintf(buf, sizeof(buf), "%d", params.value + 1);
|
||||||
|
+
|
||||||
|
+ if (! grub_envblk_set (envblk, argv[0], buf))
|
||||||
|
+ grub_util_error ("%s", _("environment block too small"));
|
||||||
|
+
|
||||||
|
+ argc--;
|
||||||
|
+ argv++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ write_envblk (name, envblk);
|
||||||
|
+ grub_envblk_close (envblk);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main (int argc, char *argv[])
|
||||||
|
{
|
||||||
|
@@ -292,6 +340,8 @@ main (int argc, char *argv[])
|
||||||
|
set_variables (filename, argc - curindex, argv + curindex);
|
||||||
|
else if (strcmp (command, "unset") == 0)
|
||||||
|
unset_variables (filename, argc - curindex, argv + curindex);
|
||||||
|
+ else if (strcmp (command, "incr") == 0)
|
||||||
|
+ incr_variables (filename, argc - curindex, argv + curindex);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char *program = xstrdup(program_name);
|
||||||
@ -0,0 +1,189 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Date: Wed, 6 Jun 2018 08:44:11 +0200
|
||||||
|
Subject: [PATCH] Add auto-hide menu support
|
||||||
|
|
||||||
|
On single-os systems we do not want to show the menu, unless something
|
||||||
|
went wrong with the previous boot, in which case the user may need the
|
||||||
|
menu to debug/fix the problem.
|
||||||
|
|
||||||
|
This commit adds a new grub.d/00_menu_auto_hide file which emits a
|
||||||
|
config snippet implementing this. I've chosen to do this in a separate
|
||||||
|
grub.d file because chances of this going upstream are small and this way
|
||||||
|
it will be easier to rebase.
|
||||||
|
|
||||||
|
Since auto-hiding the menu requires detecting the previous boot was ok,
|
||||||
|
we get fastboot support (where we don't check for a key at all) for free
|
||||||
|
so this commit also adds support for this.
|
||||||
|
|
||||||
|
The new config-file code uses the following variables:
|
||||||
|
|
||||||
|
menu_auto_hide Set this to "1" to activate the new auto-hide feature
|
||||||
|
Set this to "2" to auto-hide the menu even when multiple
|
||||||
|
operating systems are installed. Note the menu will still
|
||||||
|
auto show after booting an other os as that won't set
|
||||||
|
boot_success.
|
||||||
|
menu_show_once Set this to "1" to force showing the menu once.
|
||||||
|
boot_success The OS sets this to "1" to indicate a successful boot.
|
||||||
|
boot_indeterminate The OS increments this integer when rebooting after e.g.
|
||||||
|
installing updates or a selinux relabel.
|
||||||
|
fastboot If set to "1" and the conditions for auto-hiding the menu
|
||||||
|
are met, the menu is not shown and all checks for keypresses
|
||||||
|
are skipped, booting the default immediately.
|
||||||
|
|
||||||
|
30_os-prober.in changes somewhat inspired by:
|
||||||
|
https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/tree/debian/patches/quick_boot.patch
|
||||||
|
|
||||||
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
---
|
||||||
|
Changes in v2:
|
||||||
|
-Drop shutdown_success tests, there is no meaningful way for systemd to set
|
||||||
|
this flag (by the time it knows all filesystems are unmounted or read-only
|
||||||
|
-Drop fwsetup_once support, systemd already supports booting directly into
|
||||||
|
the fwsetup by doing "systemctl reboot --firmware"
|
||||||
|
---
|
||||||
|
Makefile.util.def | 6 +++++
|
||||||
|
util/grub.d/01_menu_auto_hide.in | 48 ++++++++++++++++++++++++++++++++++++++++
|
||||||
|
util/grub.d/30_os-prober.in | 18 +++++++++++++++
|
||||||
|
3 files changed, 72 insertions(+)
|
||||||
|
create mode 100644 util/grub.d/01_menu_auto_hide.in
|
||||||
|
|
||||||
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
||||||
|
index 41906486a71..04551e095bd 100644
|
||||||
|
--- a/Makefile.util.def
|
||||||
|
+++ b/Makefile.util.def
|
||||||
|
@@ -458,6 +458,12 @@ script = {
|
||||||
|
installdir = grubconf;
|
||||||
|
};
|
||||||
|
|
||||||
|
+script = {
|
||||||
|
+ name = '01_menu_auto_hide';
|
||||||
|
+ common = util/grub.d/01_menu_auto_hide.in;
|
||||||
|
+ installdir = grubconf;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
script = {
|
||||||
|
name = '01_users';
|
||||||
|
common = util/grub.d/01_users.in;
|
||||||
|
diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..ad175870a54
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/util/grub.d/01_menu_auto_hide.in
|
||||||
|
@@ -0,0 +1,48 @@
|
||||||
|
+#! /bin/sh
|
||||||
|
+
|
||||||
|
+# Disable / skip generating menu-auto-hide config parts on serial terminals
|
||||||
|
+for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|
||||||
|
+ case "$x" in
|
||||||
|
+ serial*)
|
||||||
|
+ exit 0
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
+cat << EOF
|
||||||
|
+if [ "\${boot_success}" = "1" -o "\${boot_indeterminate}" = "1" ]; then
|
||||||
|
+ set last_boot_ok=1
|
||||||
|
+else
|
||||||
|
+ set last_boot_ok=0
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+# Reset boot_indeterminate after a successful boot
|
||||||
|
+if [ "\${boot_success}" = "1" ] ; then
|
||||||
|
+ set boot_indeterminate=0
|
||||||
|
+# Avoid boot_indeterminate causing the menu to be hidden more then once
|
||||||
|
+elif [ "\${boot_indeterminate}" = "1" ]; then
|
||||||
|
+ set boot_indeterminate=2
|
||||||
|
+fi
|
||||||
|
+set boot_success=0
|
||||||
|
+save_env boot_success boot_indeterminate
|
||||||
|
+
|
||||||
|
+if [ x\$feature_timeout_style = xy ] ; then
|
||||||
|
+ if [ "\${menu_show_once}" ]; then
|
||||||
|
+ unset menu_show_once
|
||||||
|
+ save_env menu_show_once
|
||||||
|
+ set timeout_style=menu
|
||||||
|
+ set timeout=60
|
||||||
|
+ elif [ "\${menu_auto_hide}" -a "\${last_boot_ok}" = "1" ]; then
|
||||||
|
+ set orig_timeout_style=\${timeout_style}
|
||||||
|
+ set orig_timeout=\${timeout}
|
||||||
|
+ if [ "\${fastboot}" = "1" ]; then
|
||||||
|
+ # timeout_style=menu + timeout=0 avoids the countdown code keypress check
|
||||||
|
+ set timeout_style=menu
|
||||||
|
+ set timeout=0
|
||||||
|
+ else
|
||||||
|
+ set timeout_style=hidden
|
||||||
|
+ set timeout=1
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+EOF
|
||||||
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
||||||
|
index 4b27bd20153..3c9431cfcfb 100644
|
||||||
|
--- a/util/grub.d/30_os-prober.in
|
||||||
|
+++ b/util/grub.d/30_os-prober.in
|
||||||
|
@@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
osx_entry() {
|
||||||
|
+ found_other_os=1
|
||||||
|
# TRANSLATORS: it refers on the OS residing on device %s
|
||||||
|
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
||||||
|
hints=""
|
||||||
|
@@ -102,6 +103,7 @@ for OS in ${OSPROBED} ; do
|
||||||
|
|
||||||
|
case ${BOOT} in
|
||||||
|
chain)
|
||||||
|
+ found_other_os=1
|
||||||
|
|
||||||
|
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
||||||
|
cat << EOF
|
||||||
|
@@ -132,6 +134,7 @@ EOF
|
||||||
|
EOF
|
||||||
|
;;
|
||||||
|
efi)
|
||||||
|
+ found_other_os=1
|
||||||
|
|
||||||
|
EFIPATH=${DEVICE#*@}
|
||||||
|
DEVICE=${DEVICE%@*}
|
||||||
|
@@ -176,6 +179,7 @@ EOF
|
||||||
|
LINITRD="${LINITRD#/boot}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
+ found_other_os=1
|
||||||
|
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
||||||
|
recovery_params="$(echo "${LPARAMS}" | grep single)" || true
|
||||||
|
counter=1
|
||||||
|
@@ -257,6 +261,7 @@ EOF
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
hurd)
|
||||||
|
+ found_other_os=1
|
||||||
|
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
|
||||||
|
cat << EOF
|
||||||
|
menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
|
||||||
|
@@ -283,6 +288,7 @@ EOF
|
||||||
|
EOF
|
||||||
|
;;
|
||||||
|
minix)
|
||||||
|
+ found_other_os=1
|
||||||
|
cat << EOF
|
||||||
|
menuentry "${LONGNAME} (on ${DEVICE}, Multiboot)" {
|
||||||
|
EOF
|
||||||
|
@@ -299,3 +305,15 @@ EOF
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
+
|
||||||
|
+# We override the results of the menu_auto_hide code here, this is a bit ugly,
|
||||||
|
+# but grub-mkconfig writes out the file linearly, so this is the only way
|
||||||
|
+if [ "${found_other_os}" = "1" ]; then
|
||||||
|
+ cat << EOF
|
||||||
|
+# Other OS found, undo autohiding of menu unless menu_auto_hide=2
|
||||||
|
+if [ "\${orig_timeout_style}" -a "\${menu_auto_hide}" != "2" ]; then
|
||||||
|
+ set timeout_style=\${orig_timeout_style}
|
||||||
|
+ set timeout=\${orig_timeout}
|
||||||
|
+fi
|
||||||
|
+EOF
|
||||||
|
+fi
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue