Re: git: 65904399db91 - main - efibootmgr: allow -u as a valid option

From: Gary Jennejohn <garyj_at_gmx.de>
Date: Mon, 25 Mar 2024 15:47:51 UTC
On Mon, 25 Mar 2024 07:37:54 -0700
Mark Peek <mp@freebsd.org> wrote:

> On Mon, Mar 25, 2024 at 2:01?AM Gary Jennejohn <garyj@gmx.de> wrote:
>
> > On Sun, 24 Mar 2024 19:39:49 GMT
> > Mark Peek <mp@FreeBSD.org> wrote:
> >
> > > The branch main has been updated by mp:
> > >
> > > URL:
> > https://cgit.FreeBSD.org/src/commit/?id=65904399db9167b0970e42e14642e1d6bdbf6d3a
> > >
> > > commit 65904399db9167b0970e42e14642e1d6bdbf6d3a
> > > Author:     Mark Peek <mp@FreeBSD.org>
> > > AuthorDate: 2024-03-24 19:37:12 +0000
> > > Commit:     Mark Peek <mp@FreeBSD.org>
> > > CommitDate: 2024-03-24 19:37:12 +0000
> > >
> > >     efibootmgr: allow -u as a valid option
> > >
> > >     PR:             277907
> > >     Reported by:    vsasjason@gmail.com
> > >     MFC after:      1 week
> > > ---
> > >  usr.sbin/efibootmgr/efibootmgr.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/usr.sbin/efibootmgr/efibootmgr.c
> > b/usr.sbin/efibootmgr/efibootmgr.c
> > > index 2bc79ee26f51..b919130d9c11 100644
> > > --- a/usr.sbin/efibootmgr/efibootmgr.c
> > > +++ b/usr.sbin/efibootmgr/efibootmgr.c
> > > @@ -204,8 +204,8 @@ parse_args(int argc, char *argv[])
> > >       int ch;
> > >       const char *arg;
> > >
> > > -     while ((ch = getopt_long(argc, argv,
> > "AaBb:C:cdDe:EFfhk:L:l:NnOo:pTt:v",
> > > -                 lopts, NULL)) != -1) {
> > > +     while ((ch = getopt_long(argc, argv,
> > > +         "AaBb:C:cdDe:EFfhk:L:l:NnOo:pTt:u:v", lopts, NULL)) != -1) {
> > >               switch (ch) {
> > >               case 'A':
> > >                       opts.set_inactive = true;
> > >
> >
> > -u is not documented in the man page for efibootmgr, although it was
> > already in the source.
> >
> > --
> > Gary Jennejohn
> >
>
> Gary,
> I'm not sure I understand your comment. The man page was updated for -u in
> this commit:
> https://github.com/freebsd/freebsd-src/commit/9a7915299484a767fbffc7234b8dc45c29954cca
>
> And man shows this as:
>      efibootmgr -u unix-path
>      ...
>      -u --efidev unix-path
>              Displays the UEFI device path of unix-path.

Ah yes.  I looked at the man page under /usr/share/man/man8 which isn't
up to date.  I should have looked at
/usr/src/usr.sbin/efibootmgr/efibootmgr.8 instead.

Sorry for that.

--
Gary Jennejohn