2020-06-23 15:12:25

by Geert Uytterhoeven

Subject: [PATCH] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes

EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not
be enabled by default.

In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command
line initrd loading for x86"), keep the default for X86.

Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/firmware/efi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index e6fc022bc87e03ab..56055c61904e49f4 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -127,7 +127,7 @@ config EFI_ARMSTUB_DTB_LOADER
config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
bool "Enable the command line initrd loader" if !X86
depends on EFI_STUB && (EFI_GENERIC_STUB || X86)
- default y
+ default y if X86
help
Select this config option to add support for the initrd= command
line parameter, allowing an initrd that resides on the same volume
--
2.17.1

2020-06-25 18:14:48

by Ard Biesheuvel

Subject: Re: [PATCH] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes

On Tue, 23 Jun 2020 at 17:09, Geert Uytterhoeven
<[email protected]> wrote:
>
> EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not
> be enabled by default.
>
> In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command
> line initrd loading for x86"), keep the default for X86.
>
> Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable")
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Queued as a fix, thanks.

> ---
> drivers/firmware/efi/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> index e6fc022bc87e03ab..56055c61904e49f4 100644
> --- a/drivers/firmware/efi/Kconfig
> +++ b/drivers/firmware/efi/Kconfig
> @@ -127,7 +127,7 @@ config EFI_ARMSTUB_DTB_LOADER
> config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
> bool "Enable the command line initrd loader" if !X86
> depends on EFI_STUB && (EFI_GENERIC_STUB || X86)
> - default y
> + default y if X86
> help
> Select this config option to add support for the initrd= command
> line parameter, allowing an initrd that resides on the same volume
> --
> 2.17.1
>

2020-07-09 06:45:53

by Ard Biesheuvel

Subject: Re: [PATCH] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes

On Thu, 25 Jun 2020 at 19:11, Ard Biesheuvel <[email protected]> wrote:
>
> On Tue, 23 Jun 2020 at 17:09, Geert Uytterhoeven
> <[email protected]> wrote:
> >
> > EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not
> > be enabled by default.
> >
> > In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command
> > line initrd loading for x86"), keep the default for X86.
> >
> > Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable")
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
>
> Queued as a fix, thanks.
>

I am going to have to postpone this one - it appears kernelCI uses
QEMU firmware that does not implement the new initrd loading protocol
yet, so I will need to get that fixed first.


> > ---
> > drivers/firmware/efi/Kconfig | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> > index e6fc022bc87e03ab..56055c61904e49f4 100644
> > --- a/drivers/firmware/efi/Kconfig
> > +++ b/drivers/firmware/efi/Kconfig
> > @@ -127,7 +127,7 @@ config EFI_ARMSTUB_DTB_LOADER
> > config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
> > bool "Enable the command line initrd loader" if !X86
> > depends on EFI_STUB && (EFI_GENERIC_STUB || X86)
> > - default y
> > + default y if X86
> > help
> > Select this config option to add support for the initrd= command
> > line parameter, allowing an initrd that resides on the same volume
> > --
> > 2.17.1
> >