git: ee234a8f1703 - releng/15.0 - freebsd-update: Swap pkg(8) flags in check_pkgbase()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Nov 2025 18:53:09 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=ee234a8f17039ca770fda42e45ba9559bc2eb24a
commit ee234a8f17039ca770fda42e45ba9559bc2eb24a
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-11-06 16:06:12 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-11-10 18:49:08 +0000
freebsd-update: Swap pkg(8) flags in check_pkgbase()
Unbootstrapped pkg will ignore -N if -r is specified first. Flip the
order.
Prior to commit 66c75fa63aff this worked by accident.
Approved by: re (cperciva)
PR: 290393
Reported by: olgeni
MFC after: 3 days
Fixes: 66c75fa63aff ("freebsd-update: Fix the pkgbase check")
(cherry picked from commit 645352316be6901077dc1a3ce26f41934136f412)
(cherry picked from commit addc0556ce547425f9810fe081b46e8472340333)
---
usr.sbin/freebsd-update/freebsd-update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index 7815502dba39..23f1106e3bde 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -1103,7 +1103,7 @@ IDS_check_params () {
check_pkgbase()
{
# Packaged base requires that pkg is bootstrapped.
- if ! pkg -r ${BASEDIR} -N >/dev/null 2>/dev/null; then
+ if ! pkg -N -r ${BASEDIR} >/dev/null 2>/dev/null; then
return 1
fi
# uname(1) is used by pkg to determine ABI, so it should exist.