summaryrefslogtreecommitdiff
path: root/apt-pkg/init.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-12-03 17:39:03 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-01-14 14:03:39 +0100
commit5629f35ecb7956b180364ebaf57e79f35885344e (patch)
treeb7b2aaf97a28558551ebcf45717099da5998601a /apt-pkg/init.cc
parent78ead40e1675cae98eb545b0c7369c9f2123ef71 (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
Diffstat (limited to 'apt-pkg/init.cc')
-rw-r--r--apt-pkg/init.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index ab0474fac..43092381d 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -150,6 +150,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");