diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-12-12 17:59:09 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-12-12 17:59:09 +0000 |
| commit | 0a119c2870bda801617063dd1163e2f4c4cf23b6 (patch) | |
| tree | 517c8555fa73a2e782da273953eec6b3c4a98f25 /usr.sbin/pkg/pkg.7 | |
| parent | 705815f12f1eca04cc56c85954c953b1c586debd (diff) | |
| download | FreeBSD-src-0a119c2870bda801617063dd1163e2f4c4cf23b6.zip FreeBSD-src-0a119c2870bda801617063dd1163e2f4c4cf23b6.tar.gz | |
Fix multi-repository support by properly respecting 'enabled' flag.
This will read the REPOS_DIR env/config setting (default is /etc/pkg
and /usr/local/etc/pkg/repos) and use the last enabled repository.
This can be changed in the environment using a comma-separated list,
or in /usr/local/etc/pkg.conf with JSON array syntax of:
REPOS_DIR: ["/etc/pkg", "/usr/local/etc/pkg/repos"]
Approved by: bapt
MFC after: 1 week
Diffstat (limited to 'usr.sbin/pkg/pkg.7')
| -rw-r--r-- | usr.sbin/pkg/pkg.7 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/pkg/pkg.7 b/usr.sbin/pkg/pkg.7 index e46f3dd..342c934 100644 --- a/usr.sbin/pkg/pkg.7 +++ b/usr.sbin/pkg/pkg.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 19, 2013 +.Dd December 12, 2013 .Dt PKG 7 .Os .Sh NAME @@ -152,6 +152,7 @@ MIRROR_TYPE: "srv", SIGNATURE_TYPE: "none", FINGERPRINTS: "/usr/share/keys/pkg", ASSUME_ALWAYS_YES: "yes" +REPOS_DIR: ["/etc/pkg", "/usr/local/etc/pkg/repos"] .Ed .Pp Reference @@ -194,14 +195,20 @@ The URL that .Xr pkg 8 and other packages will be fetched from. +.It Ev REPOS_DIR +Comma-separated list of directories that should be searched for repository +configuration files. .El .Sh FILES Configuration is read from the files in the listed order. -The first enabled repository is the one used for bootstrapping +This path can be changed by setting +.Sy REPOS_DIR . +The last enabled repository is the one used for bootstrapping .Xr pkg 8 . .Bl -tag -width "/usr/local/etc/pkg/repos/*.conf" .It Pa /usr/local/etc/pkg.conf .It Pa /etc/pkg/FreeBSD.conf +.It Pa /usr/local/etc/pkg/repos/*.conf .El .Sh EXAMPLES Some examples are listed here. |
