From owner-dev-commits-src-branches@freebsd.org Thu Feb 4 23:56:30 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F755534001 for ; Thu, 4 Feb 2021 23:56:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWwSG3z2dz3PPw for ; Thu, 4 Feb 2021 23:56:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82c.google.com with SMTP id z22so3807269qto.7 for ; Thu, 04 Feb 2021 15:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Jx30byh333ior8Gj6CbNspcK76/Tlh5/RkJlrIk3B28=; b=iWEbtIkOvloJJja1Wft/gFqYR+Btv4mn31WRBW3PfYPruaoHvSbGxn8a3gRuKIP5p9 pUHmcvHP/MLvkG+x9WN3pFhfvLcJ7pg+s2VfNjKdIq6j9RdpGgZw6UcxAOf18XzwXXaW nV1FoRuilgPfn9aXOVkFRZWg5jTxrZZb3dTYrykVvu/Aun1iWc06I73yz93ezckturXl kFj23mFO+p0jo8bjMQ2ABb+7d1DejUOHzEzTx5M14uXGUp9mN775ytOCjk4gi1wI/vOb 4PH6sSzevW176LIpfF5UNjM9ZNo8LjlKC0U9rsqrHujb1ESI585nOHDEqAQl9vkwsd66 GlCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Jx30byh333ior8Gj6CbNspcK76/Tlh5/RkJlrIk3B28=; b=HSCz5smcLV82YvdIXMG58LduhaeVNErincq503t5qzMiJ7bgetYGiDziL2VVzy7/R0 cgRnUFpVcQzmsnJuCUyEyTJhSATsIdolR+T1M2BP681TaAMoCgSY518SvVfRGq815hdz BQJkuyMrbM5ho3WGXL9HeZMuOJJocaCQ4zndQk1tZr/X//AFHk931B6YGXRjJ82xEeoH 8QhOtfM5cHtpAj67BGyujJU7H/lJFg4gHVHAFd0WAYIXAdps0NHTTo1EPXQrI9b2d4fl QGiW0Rkw+QsD1O/JoYPwR/W7Nvh3J2Fej5+JqZwgyvqwOldZiJWipnXO4kmBzu9kAB5t G5YA== X-Gm-Message-State: AOAM530bSDyvtmqtY+Oq1O5+Gr5ziiobc6ICQomd/UIdvVoXQpA3nRrP tbshJzC53JfrknkYVum0mb7Wo1f9zHenxVFntIFrKA== X-Google-Smtp-Source: ABdhPJzf3cfojyc7Q8kgzzjo4JEtl7wTM4WfwLOLg6VrMFfQa+ddyr5kpXvIBT+a0lwDChGtsOkWeO+GNopbCPz1NZo= X-Received: by 2002:a05:622a:1c9:: with SMTP id t9mr2072560qtw.244.1612482989370; Thu, 04 Feb 2021 15:56:29 -0800 (PST) MIME-Version: 1.0 References: <202102042134.114LYKEp029525@gitrepo.freebsd.org> In-Reply-To: <202102042134.114LYKEp029525@gitrepo.freebsd.org> From: Warner Losh Date: Thu, 4 Feb 2021 16:56:17 -0700 Message-ID: Subject: Re: git: 0c839497c174 - stable/13 - loader.efi: There are systems without ConOut, also use ConOutDev To: Toomas Soome Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org X-Rspamd-Queue-Id: 4DWwSG3z2dz3PPw X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 23:56:30 -0000 And why the instaMFC? Changes are supposed to cook force days before merging... I have questions about the wisdom of this change... Warner On Thu, Feb 4, 2021, 2:34 PM Toomas Soome wrote: > The branch stable/13 has been updated by tsoome: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=0c839497c174e961fc71f7d3329d05b10ec5525b > > commit 0c839497c174e961fc71f7d3329d05b10ec5525b > Author: Toomas Soome > AuthorDate: 2021-02-04 20:49:02 +0000 > Commit: Toomas Soome > CommitDate: 2021-02-04 21:33:15 +0000 > > loader.efi: There are systems without ConOut, also use ConOutDev > > 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. > > PR: 253253 > > (cherry picked from commit 2bd4ff2d8911009283e4e615ca4aad35a845f48b) > --- > stand/efi/loader/main.c | 2 ++ > 1 file changed, 2 insertions(+) > > 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 = 0; > sz = sizeof(buf); > rv = efi_global_getenv("ConOut", buf, &sz); > + if (rv != EFI_SUCCESS) > + rv = efi_global_getenv("ConOutDev", buf, &sz); > if (rv != EFI_SUCCESS) { > /* If we don't have any ConOut default to serial */ > how = RB_SERIAL; >