diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2018-12-03 17:39:03 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-01-14 14:35:10 +0100 |
| commit | feed3ec105cd6be7b5d23da14c6cfca8572ee725 (patch) | |
| tree | 225d5105a0a37db4940b6fa9f23384d97571af77 /apt-pkg | |
| parent | 67fdc0cf55f4e91905b16e0f582ce70999997c8d (diff) | |
Add support for /etc/apt/auth.conf.d/*.conf (netrcparts)
This allows us to install matching auth files for sources.list.d
files, for example; very useful.
This converts aptmethod's authfd from one FileFd to a vector of
pointers to FileFd, as FileFd cannot be copied, and move operators
are hard.
(cherry picked from commit bbfcc05c1978decd28df9681fd73e2a7d9a8c2a5)
LP: #1811120
(cherry picked from commit 5629f35ecb7956b180364ebaf57e79f35885344e)
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/init.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 927a5cca0..6952267cf 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -151,6 +151,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("Dir::Etc::sourceparts","sources.list.d"); Cnf.CndSet("Dir::Etc::main","apt.conf"); Cnf.CndSet("Dir::Etc::netrc", "auth.conf"); + Cnf.CndSet("Dir::Etc::netrcparts", "auth.conf.d"); Cnf.CndSet("Dir::Etc::parts","apt.conf.d"); Cnf.CndSet("Dir::Etc::preferences","preferences"); Cnf.CndSet("Dir::Etc::preferencesparts","preferences.d"); |