freebsd-update: Correctly check if pkg(8) is present
ClosedPublic
Actions

Authored by zlei on May 22 2024, 1:59 AM.

Details

Reviewers

fernape
delphij
kevans

Commits

rGd76ef58d566c: freebsd-update: Correctly check if pkg(8) is present

Summary

On system without pkg(8) installed, command -v pkg will return success
and falsely report pkg(8) is present. Fix that by checking via pkg -N
form.

This is missed from final revision of D39695.

Reported by: delphij
Fixes: bc0c6c9cf3a9 freebsd-update: Add check for kernel modules

Test Plan

Test freebsd-update upgrade on system w/o pkg(8) installed.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

zlei created this revision.May 22 2024, 1:59 AM

Herald added a subscriber: imp. · View Herald TranscriptMay 22 2024, 1:59 AM

zlei requested review of this revision.May 22 2024, 1:59 AM

LGTM.

Note I'm not an src committer

This revision is now accepted and ready to land.May 22 2024, 3:35 PM

delphij accepted this revision.May 22 2024, 4:10 PM

Closed by commit rGd76ef58d566c: freebsd-update: Correctly check if pkg(8) is present (authored by zlei). · Explain WhyMay 23 2024, 4:11 AM

This revision was automatically updated to reflect the committed changes.

zlei added a commit: rGd76ef58d566c: freebsd-update: Correctly check if pkg(8) is present.

Revision Contents
Changeset List

Path

Size

usr.sbin/

freebsd-update/

freebsd-update.sh

2 lines

Diff 138980

View Options

usr.sbin/freebsd-update/freebsd-update.sh

freebsd-update: Correctly check if pkg(8) is presentClosedPublicActions