diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-02-02 05:15:53 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-02-02 05:15:53 -0200 |
| commit | eac23547da0bbfc69c824d21730a8a414e7e0309 (patch) | |
| tree | e3c397284b177b432c2b80304af0b464e22ea5db /libre/arch-install-scripts/copykeyring_fix.patch | |
| parent | fecc0aade7375d66cc4ec468dcf904a15a5cc300 (diff) | |
remove custom gpg.conf, dirmngr.conf and sks-keyservers.netCA.pem from pacman and remove modified arch-install-scripts package for compatibility
Diffstat (limited to 'libre/arch-install-scripts/copykeyring_fix.patch')
| -rw-r--r-- | libre/arch-install-scripts/copykeyring_fix.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libre/arch-install-scripts/copykeyring_fix.patch b/libre/arch-install-scripts/copykeyring_fix.patch deleted file mode 100644 index cc4f3f8cd..000000000 --- a/libre/arch-install-scripts/copykeyring_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 |