diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-10-03 15:38:35 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-10-05 16:49:57 +0300 |
| commit | 7c2a3657fb4b6a1a8f5321e418a0a6baf10627e1 (patch) | |
| tree | 85ca6c3101f007f5652d1bb926b29a2a1d496e1d | |
| parent | 6cedfe27ac566e7de7d0c24778c4280e8311bbec (diff) | |
| download | apk-tools-7c2a3657fb4b6a1a8f5321e418a0a6baf10627e1.tar.gz apk-tools-7c2a3657fb4b6a1a8f5321e418a0a6baf10627e1.tar.bz2 apk-tools-7c2a3657fb4b6a1a8f5321e418a0a6baf10627e1.tar.xz apk-tools-7c2a3657fb4b6a1a8f5321e418a0a6baf10627e1.zip | |
db: make --repositories-file relative to host root
It used to be relative to the --root specified root, but that
causes issues with relative command line filenames and is unintuitive.
Update documentation accordingly. Fixes #10702.
| -rw-r--r-- | doc/apk.8.scd | 6 | ||||
| -rw-r--r-- | src/database.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/apk.8.scd b/doc/apk.8.scd index 7c94409..4f087c6 100644 --- a/doc/apk.8.scd +++ b/doc/apk.8.scd @@ -155,9 +155,9 @@ The following options are available for all commands. packages from cache on cache clean. *--repositories-file* _REPOFILE_ - Override repositories file, see *apk-repositories*(8). This directory - is relative to _ROOT_. This can be used to override normal system - repositories. + Override system repositories, see *apk-repositories*(8). Specifying this + option override the normal repositories file and repositories.d directory + processing. *--wait* _TIME_ Wait for TIME seconds to get an exclusive repository lock before diff --git a/src/database.c b/src/database.c index 29e8ea9..e064ca5 100644 --- a/src/database.c +++ b/src/database.c @@ -1700,7 +1700,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) apk_dir_foreach_file(openat(db->root_fd, "etc/apk/repositories.d", O_RDONLY | O_CLOEXEC), add_repos_from_file, db); } else { - add_repos_from_file(db, db->root_fd, dbopts->repositories_file); + add_repos_from_file(db, AT_FDCWD, dbopts->repositories_file); } if (db->repo_update_counter) |