Details

Reviewers

bapt
bdrewery
imp
markj

Group Reviewers

srcmgr

Commits

rGd94e034d5046: pkg: Add -j and -r options

Summary

This allows pkg(7) to be used to bootstrap a chroot or jail, and to
recognize the -j and -r options and pass them through to pkg(8) if
already bootstrapped.

Note that this does not address the issue of repository keys. If using
a signed package repository, you will still need to copy /usr/share/keys
into the target environment before or after bootstrapping, or pkg will
be unable to verify package signatures.

MFC after: 1 week

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 74926
Build 71809: arc lint + arc unit

Event Timeline

des created this revision.Fri, Jul 10, 7:54 PM

Herald added a reviewer: bdrewery. · View Herald TranscriptFri, Jul 10, 7:54 PM

Herald added subscribers: ziaee, imp. · View Herald Transcript

des requested review of this revision.Fri, Jul 10, 7:54 PM

Harbormaster completed remote builds in B74712: Diff 181752.Fri, Jul 10, 7:54 PM

des added a child revision: D57956: pkgbasify: Add new utility.Fri, Jul 10, 7:55 PM

I like it.

This revision is now accepted and ready to land.Sun, Jul 12, 5:16 PM

des retitled this revision from pkg: Add support for -r option to pkg: Add support for -r and -j.Mon, Jul 13, 12:57 PM

des edited the summary of this revision. (Show Details)

and -j

This revision now requires review to proceed.Mon, Jul 13, 12:57 PM

Harbormaster completed remote builds in B74768: Diff 181902.Mon, Jul 13, 12:58 PM

bapt accepted this revision.Mon, Jul 13, 2:59 PM

This revision is now accepted and ready to land.Mon, Jul 13, 2:59 PM

Closed by commit rGd94e034d5046: pkg: Add -j and -r options (authored by des). · Explain WhyMon, Jul 13, 3:34 PM

This revision was automatically updated to reflect the committed changes.

des added a commit: rGd94e034d5046: pkg: Add -j and -r options.

markj added a subscriber: markj.Mon, Jul 13, 3:36 PM

markj added inline comments.

usr.sbin/pkg/pkg.c
96	Why is `rootd` a global variable? And shouldn't it be initialized to AT_FDCWD?

kevans added a reverting change: rG9dfaf1cb37f8: Revert "pkg: Add -j and -r options".Mon, Jul 13, 10:09 PM

des reopened this revision.Sun, Jul 19, 7:06 AM

des retitled this revision from pkg: Add support for -r and -j to pkg: Add -j and -r options.

des edited the summary of this revision. (Show Details)

we always need rootd

Harbormaster completed remote builds in B74926: Diff 182202.Sun, Jul 19, 7:06 AM

des marked an inline comment as done.Sun, Jul 19, 7:07 AM

markj added inline comments.Sun, Jul 19, 4:52 PM

usr.sbin/pkg/pkg.c
96	It still doesn't need to be global AFAICS.
264	If the assertion is false, then the program has already triggered some memory corruption and the assertion might not catch it.
288
291	This will always be zero.
1150	What if `localbase` is just "/"? I think this construction doesn't quite work in that case, `pkgpatch` will contain "//sbin/pkg" and the +1 in the faccessat() call below won't behave as you want. If `localbase` is the empty string, this also doesn't work, but I think that probably shouldn't happen.

Turns out this is a lot more complicated than I thought

Harbormaster completed remote builds in B74937: Diff 182252.Sun, Jul 19, 7:34 PM

See also D58348 and D58349

Harbormaster completed remote builds in B74954: Diff 182291.Mon, Jul 20, 3:13 PM

des marked 2 inline comments as done.Mon, Jul 20, 5:19 PM

remove unnecessary exit status checks

Harbormaster completed remote builds in B74960: Diff 182297.Mon, Jul 20, 5:25 PM

des marked 2 inline comments as done.Mon, Jul 20, 5:28 PM

des added inline comments.Tue, Jul 21, 4:11 AM

usr.sbin/pkg/pkg.c
1150	If `localbase` is an empty string then `pkgpath` will be `/sbin/pkg` which is fine, I guess. See also D58362 which adds basic normalization to `getlocalbase()`.