The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7fe2f504f8a0e4237872f8528e911c5f7b7ed59d
commit 7fe2f504f8a0e4237872f8528e911c5f7b7ed59d
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2021-02-11 23:06:30 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2021-02-11 23:09:51 +0000
efibootmgr: Check for efi supported after parsing args
Move the check for efi variables being supported to after parsing the args.
This
allows '-h' to produce both as a normal user as well as on all systems.
---
usr.sbin/efibootmgr/efibootmgr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c
index 8c7ba82cb5a5..53bc417c4e07 100644
--- a/usr.sbin/efibootmgr/efibootmgr.c
+++ b/usr.sbin/efibootmgr/efibootmgr.c
@@ -1072,11 +1072,12 @@ int
main(int argc, char *argv[])
{
+ memset(&opts, 0, sizeof (bmgr_opts_t));
+ parse_args(argc, argv);
+
if (!efi_variables_supported())
errx(1, "efi variables not supported on this system. root?
kldload efirt?");
- memset(&opts, 0, sizeof (bmgr_opts_t));
- parse_args(argc, argv);
read_vars();
if (opts.create)
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
