[tor-commits] [tor-browser-build/maint-7.5] Bug 24930: update keyring path used to debootstrap precise images

[gk at torproject.org]

commit e9fb651a29f6b649929bbeced662dcad4c1d6fc4
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Jan 18 13:24:43 2018 +0100

    Bug 24930: update keyring path used to debootstrap precise images
    
    After switching the image we use for debootstrapping from 17.04 to
    16.04.3 (in #24924), the path containing the keys for precise changed.
---
 projects/debootstrap-image/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index a06cc53..2c470be 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -44,13 +44,13 @@ targets:
       container:
         suite: precise
         arch: amd64
-        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg
   precise-i386:
     var:
       container:
         suite: precise
         arch: i386
-        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg
   utopic-amd64:
     var:
       container: