From nobody Thu Jan 11 01:25:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T9RmX2c6Pz56hW6; Thu, 11 Jan 2024 01:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T9RmX1nG3z4T6c; Thu, 11 Jan 2024 01:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704936300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZ6PYsSVVdSwaZLSNJEbsJPx4GYvzVv0MDuHkcuW+k0=; b=rnMAzBTa6JgJqjy7jhIUJMYcbdpMFaJVhLKZm7Gb19wdQI3QfKZy1+HPO1W6RBKDWQDBbN lIiOc1SRlfCbV09+OPP4KmgMOysJS2ZGIYqfHOyIHwfQV1TvgpsEQowBEOM0ggAMYf40qn Krh9oaqqIUeV+1z5ymnj/Qhx4npEDLwO8H/GQRvFPjeNu42+5SYsOqgLM+8ClpY6K/oRBm r423nI7C5Y54w1vtIDw8FTogFbrdFK9Mt7Nol91LCTTjBUbKXM0edmpUtOS7xuHpsSoXPa NqPuhjvOCILVM4qdWuhVVCSg4FqXmHovC0VOGXeYmbpN/P3TpvM5BBXOHVthWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704936300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZ6PYsSVVdSwaZLSNJEbsJPx4GYvzVv0MDuHkcuW+k0=; b=FSH57zQl6Vr6JVoPHevZd7mglRRUq6+T97cLcmbUhoLLIfoI5yzVcgj1m6Pr4fDUl36cl3 rHamrW9bEONcIXUC5TI3ShiygIHOWF6f0TTcN38sUF+z1P8aPMvzcgK2oHrgkn0Kry1Mzj fCjFDw1ZzOf3uQQv9YbqYl5zh78oVgbpyPVrLiI8M1Lqv7BYn5vyn99DjsJmJ9vCrqNcMt MnkRIEpKV7PVZys8In6pXaksmZMt0MWr3SJBYN6jx95f/bGvm72HY321VTlDo1oikcFilI xe/o4lvAi+Uk8KjEPISuQmM1kfPurcEcqXS6sF+I0c44aWnIi/EpN04OD50T3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704936300; a=rsa-sha256; cv=none; b=wHi/Wtbk7A+Pc01F607M3GIL/ftAC3ox4uo24PotyS+g+6a8vHlaMya690Zzo5+Mmkz7r8 gJZ5DhXmfiuedycts6g/AuNNEXEQK3am5UOvB3UUjyWEHM/4Uas6nryWcMV/1ZRNmVepXa Cw+rIpxdg7wlJtAVqJ67Nt/113XibwV3UwkQDknWHnCeLBV2wMT4iDl9KsiyCsgFpabfTz Sd4ToucgPKsBESvjePvDur6yzAp20IC1YIa+V2lSNUhxZJlWqcRgz7kRpILg6XTfmBKN3/ zpt/sfgEmagzLP2K66lHi5diefYkyQt7MFfD77tyjA3RTN2O9y6xxf7v6esPzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T9RmX0qZhzyRj; Thu, 11 Jan 2024 01:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40B1P0T5089238; Thu, 11 Jan 2024 01:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B1P083089235; Thu, 11 Jan 2024 01:25:00 GMT (envelope-from git) Date: Thu, 11 Jan 2024 01:25:00 GMT Message-Id: <202401110125.40B1P083089235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 01641167c966 - stable/14 - efibootmgr: provide explicit error message if run as non-root List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01641167c9660e98122c3f6174878d534a83b57e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=01641167c9660e98122c3f6174878d534a83b57e commit 01641167c9660e98122c3f6174878d534a83b57e Author: Ed Maste AuthorDate: 2023-10-15 17:21:52 +0000 Commit: Ed Maste CommitDate: 2024-01-11 01:23:56 +0000 efibootmgr: provide explicit error message if run as non-root This should be less confusing for new users. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42213 (cherry picked from commit c08ba4a588d517e3c5fe00cee0927294d2490993) --- usr.sbin/efibootmgr/efibootmgr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index b0d023e3539c..8dcf9876486d 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -1101,8 +1101,11 @@ main(int argc, char *argv[]) /* * find_dev can operate without any efi variables */ - if (!efi_variables_supported() && !opts.find_dev) - errx(1, "efi variables not supported on this system. root? kldload efirt?"); + if (!efi_variables_supported() && !opts.find_dev) { + if (errno == EACCES && geteuid() != 0) + errx(1, "must be run as root"); + errx(1, "efi variables not supported on this system. kldload efirt?"); + } read_vars();