Commit 7c2a3657 authored by Timo Teräs's avatar Timo Teräs
Browse files

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.
parent 6cedfe27
Pipeline #51606 passed with stage
in 43 seconds
......@@ -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
Override system repositories, see *apk-repositories*(8). Specifying this
option override the normal repositories file and repositories.d directory
*--wait* _TIME_
Wait for TIME seconds to get an exclusive repository lock before
......@@ -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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment