diff options
Diffstat (limited to 'libre/arch-install-scripts/copykeyring_fix.patch')
| -rw-r--r-- | libre/arch-install-scripts/copykeyring_fix.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libre/arch-install-scripts/copykeyring_fix.patch b/libre/arch-install-scripts/copykeyring_fix.patch new file mode 100644 index 000000000..cc4f3f8cd --- /dev/null +++ b/libre/arch-install-scripts/copykeyring_fix.patch @@ -0,0 +1,15 @@ +diff -Nur arch-install-scripts-14.orig/pacstrap.in arch-install-scripts-14/pacstrap.in +--- arch-install-scripts-14.orig/pacstrap.in 2014-12-12 21:43:21.000000000 -0200 ++++ arch-install-scripts-14/pacstrap.in 2015-02-02 01:21:12.998548374 -0200 +@@ -109,10 +109,7 @@ + fi + + if (( copykeyring )); then +- # if there's a keyring on the host, copy it into the new root, unless it exists already +- if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then +- cp -a /etc/pacman.d/gnupg "$newroot/etc/pacman.d/" +- fi ++ cp -na /etc/pacman.d/gnupg/* "$newroot/etc/pacman.d/gnupg/" + fi + + if (( copymirrorlist )); then |