josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

instead of hardcoding /etc/apt/trusted.gpg, read it from apt-config shell

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-01-22 00:28:48 +01:00
parent efaea907e9
commit c26ec4d6fc
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mmdebstrap
View file

@ -2685,6 +2685,13 @@ sub main() {
# copy ARGV because getopt modifies it # copy ARGV because getopt modifies it
my @ARGVORIG = @ARGV; my @ARGVORIG = @ARGV;
# obtain the correct defaults for the keyring locations that apt knows
# about
my $apttrusted
= `eval \$(apt-config shell v Dir::Etc::trusted/f); printf \$v`;
my $apttrustedparts
= `eval \$(apt-config shell v Dir::Etc::trustedparts/d); printf \$v`;
chomp(my $hostarch = `dpkg --print-architecture`); chomp(my $hostarch = `dpkg --print-architecture`);
my $options = { my $options = {
components => ["main"], components => ["main"],
@ -2694,8 +2701,8 @@ sub main() {
mode => 'auto', mode => 'auto',
dpkgopts => [], dpkgopts => [],
aptopts => [], aptopts => [],
apttrusted => "/etc/apt/trusted.gpg", apttrusted => $apttrusted,
apttrustedparts => "/etc/apt/trusted.gpg.d", apttrustedparts => $apttrustedparts,
noop => [], noop => [],
setup_hook => [], setup_hook => [],
essential_hook => [], essential_hook => [],