only set apt Dir config option instead of setting apt directories individually

This commit is contained in:
Johannes 'josch' Schauer 2019-02-28 12:22:42 +01:00
parent e1a41fac94
commit 473bc354ae
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -941,10 +941,7 @@ sub setup {
} else { } else {
print $conf "Apt::Architectures \"$options->{nativearch}\";\n"; print $conf "Apt::Architectures \"$options->{nativearch}\";\n";
} }
print $conf "Dir::Etc \"$options->{root}/etc/apt\";\n"; print $conf "Dir \"$options->{root}\";\n";
print $conf "Dir::State \"$options->{root}/var/lib/apt\";\n";
print $conf "Dir::Cache \"$options->{root}/var/cache/apt\";\n";
print $conf "Dir::Log \"$options->{root}/var/log/apt\";\n";
# for authentication, use the keyrings from the host # for authentication, use the keyrings from the host
print $conf "Dir::Etc::Trusted \"/etc/apt/trusted.gpg\";\n"; print $conf "Dir::Etc::Trusted \"/etc/apt/trusted.gpg\";\n";
print $conf "Dir::Etc::TrustedParts \"/etc/apt/trusted.gpg.d\";\n"; print $conf "Dir::Etc::TrustedParts \"/etc/apt/trusted.gpg.d\";\n";