Date: Fri, 5 Feb 2021 08:38:39 +0200 From: Toomas Soome <tsoome@me.com> To: Warner Losh <imp@bsdimp.com> Cc: Toomas Soome <tsoome@freebsd.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 0c839497c174 - stable/13 - loader.efi: There are systems without ConOut, also use ConOutDev Message-ID: <CF59D855-228A-4BC1-AC4B-0C54417EF3BF@me.com> In-Reply-To: <CANCZdfqXU7Syo4wvxJ17Gt%2B0E2Kw8yOU_nrTNA%2Beu=z-ZwTKow@mail.gmail.com> References: <CANCZdfqXU7Syo4wvxJ17Gt%2B0E2Kw8yOU_nrTNA%2Beu=z-ZwTKow@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 5. Feb 2021, at 01:56, Warner Losh <imp@bsdimp.com> wrote: >=20 > =EF=BB=BF > And why the instaMFC? Changes are supposed to cook force days before mergi= ng... I have questions about the wisdom of this change... >=20 > Warner=20 >=20 Reason is in PR. There is someone with the system without ConOut but ConOutD= ev is set. Instead of falling back to arbitrary device (which in this case w= as totally wrong choice), we can try the possible devices list. We do not ch= ange the ConOut parsing. If it would appear, there are systems with unusable devices listed in ConOut= Dev, then we need to think how to handle such case. Thanks, Toomas >> On Thu, Feb 4, 2021, 2:34 PM Toomas Soome <tsoome@freebsd.org> wrote: >> The branch stable/13 has been updated by tsoome: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D0c839497c174e961fc71f7d332= 9d05b10ec5525b >>=20 >> commit 0c839497c174e961fc71f7d3329d05b10ec5525b >> Author: Toomas Soome <tsoome@FreeBSD.org> >> AuthorDate: 2021-02-04 20:49:02 +0000 >> Commit: Toomas Soome <tsoome@FreeBSD.org> >> CommitDate: 2021-02-04 21:33:15 +0000 >>=20 >> loader.efi: There are systems without ConOut, also use ConOutDev >>=20 >> Conout does contian the default output device name. >> ConOutDev does contain all possible output device names, so we can >> use it as fallback, when there is no ConOut. >>=20 >> PR: 253253 >>=20 >> (cherry picked from commit 2bd4ff2d8911009283e4e615ca4aad35a845f48b) >> --- >> stand/efi/loader/main.c | 2 ++ >> 1 file changed, 2 insertions(+) >>=20 >> diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c >> index ca41cd4a2610..32b278950745 100644 >> --- a/stand/efi/loader/main.c >> +++ b/stand/efi/loader/main.c >> @@ -735,6 +735,8 @@ parse_uefi_con_out(void) >> how =3D 0; >> sz =3D sizeof(buf); >> rv =3D efi_global_getenv("ConOut", buf, &sz); >> + if (rv !=3D EFI_SUCCESS) >> + rv =3D efi_global_getenv("ConOutDev", buf, &sz); >> if (rv !=3D EFI_SUCCESS) { >> /* If we don't have any ConOut default to serial */ >> how =3D RB_SERIAL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CF59D855-228A-4BC1-AC4B-0C54417EF3BF>