git: 645352316be6 - main - freebsd-update: Swap pkg(8) flags in check_pkgbase()

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Thu, 06 Nov 2025 16:10:27 UTC 
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=645352316be6901077dc1a3ce26f41934136f412

commit 645352316be6901077dc1a3ce26f41934136f412
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-11-06 16:06:12 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-11-06 16:06:12 +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.
    
    PR:             290393
    Reported by:    olgeni
    MFC after:      3 days
    Fixes:          66c75fa63aff ("freebsd-update: Fix the pkgbase check")
---
 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 143d93a6dcc0..2a07bc1fb7bc 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.