summaryrefslogtreecommitdiff
path: root/libre/arch-install-scripts/copykeyring_fix.patch
blob: cc4f3f8cdd94791ef24a6db97a07662ac9649fa9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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