Use BASEDIR when checking for src component
ClosedPublic
Actions

Authored by aryeeteygerald_rogers.com on Jan 15 2019, 10:19 PM.

Details

Reviewers

emaste
delphij

Commits

rS343152: freebsd-update: Use BASEDIR when checking for src component

Summary

src could potentially be installed under the based dir
and not under the root or vice versa.

This patch only supports the command line specified -b or
"BaseDir" in the configuration file if it appears *before*
the "Components" line.

PR: 224048

Test Plan

None

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 21975
Build 21211: arc lint + arc unit

Event Timeline

aryeeteygerald_rogers.com created this revision.Jan 15 2019, 10:19 PM

Harbormaster completed remote builds in B21975: Diff 52870.Jan 15 2019, 10:19 PM

aryeeteygerald_rogers.com edited the summary of this revision. (Show Details)Jan 15 2019, 10:20 PM

emaste added subscribers: bcran, cperciva.Jan 17 2019, 7:22 PM

emaste added a subscriber: delphij.Jan 17 2019, 10:34 PM

delphij requested changes to this revision.Jan 18 2019, 1:05 AM

delphij added inline comments.

usr.sbin/freebsd-update/freebsd-update.sh
231	Can we simply change /usr/src to ${BASEDIR}/usr/src here?

This revision now requires changes to proceed.Jan 18 2019, 1:05 AM

Simplify src component check

Harbormaster completed remote builds in B22028: Diff 52990.Jan 18 2019, 4:40 PM

aryeeteygerald_rogers.com marked an inline comment as done.Jan 18 2019, 5:01 PM

aryeeteygerald_rogers.com added inline comments.

usr.sbin/freebsd-update/freebsd-update.sh
231	I was worried about it not being defined earlier since that's possible, but it shouldn't matter

aryeeteygerald_rogers.com marked an inline comment as done.Jan 18 2019, 5:01 PM

LGTM, thanks!

This revision is now accepted and ready to land.Jan 18 2019, 5:28 PM

Closed by commit rS343152: freebsd-update: Use BASEDIR when checking for src component (authored by emaste). · Explain WhyJan 18 2019, 5:42 PM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: imp. · View Herald TranscriptJan 18 2019, 5:42 PM

grembo mentioned this in D21473: freebsd-update: Add `updatesready` and `showconfig` commands..Aug 30 2019, 2:21 AM

grembo mentioned this in D21579: freebsd-update: Fix src component detection.Sep 9 2019, 10:39 PM

Revision Contents
Changeset List

Path

Size

usr.sbin/

freebsd-update/

freebsd-update.sh

9 lines

Diff 52870

View Options

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

Use BASEDIR when checking for src componentClosedPublicActions