diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2019-01-25 12:21:03 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2019-01-25 12:21:03 +0100 |
| commit | 22c1f8547f7fcb345289add6a2c06c7def4e571b (patch) | |
| tree | 08846d1e08489054b2fcf426226ba0ed5f2b5035 /arch-nspawn.in | |
| parent | ba51ec598c9eb8c03493e4fadfe27b8065296b17 (diff) | |
| parent | a800df3fbc55204f66f54248aaf87ba797307f96 (diff) | |
| download | devtools32-i486.tar.xz | |
Merge branch 'master' into i486i486
Diffstat (limited to 'arch-nspawn.in')
| -rw-r--r-- | arch-nspawn.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 79cff1a..7132885 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -103,7 +103,8 @@ build_mount_args() { } copy_hostconf () { - cp -a /etc/pacman.d/gnupg "$working_dir/etc/pacman.d" + gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1 + pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1 echo "Server = $host_mirror" | \ tee "$working_dir/etc/pacman.d/mirrorlist" > \ "$working_dir/etc/pacman.d/mirrorlist32" |