curtin-dev team mailing list archive

[Ryan Harper <rharper@xxxxxxxxxxx>]

Ryan Harper has proposed merging ~raharper/curtin:fix/curtainer-minimal-ppa-keys into curtin:master.

Commit message:
tools/curtainer: dearmor gpg key and use apt-key add

Older versions of apt do not support ASCII-armored gpg keys in
the /etc/apt/trusted.gpg.d directory.  Instead unwrap the gpg
key and import it directly into apt keyring with apt-add.

LP: #1898609

Requested reviews:
  curtin developers (curtin-dev)
Related bugs:
  Bug #1898609 in curtin: "curtainer: does not work with xenial minimal images"
  https://bugs.launchpad.net/curtin/+bug/1898609

For more details, see:
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/391842
-- 
Your team curtin developers is requested to review the proposed merge of ~raharper/curtin:fix/curtainer-minimal-ppa-keys into curtin:master.

diff --git a/tools/curtainer b/tools/curtainer
index b24884b..bacc66c 100755
--- a/tools/curtainer
+++ b/tools/curtainer
@@ -204,13 +204,12 @@ main() {
             # https://launchpad.net/~curtin-dev/+archive/ubuntu/daily
             local url="http://ppa.launchpad.net/curtin-dev/daily/ubuntu";
             local lfile="/etc/apt/sources.list.d/curtin-daily-ppa.list"
-            local kfile="/etc/apt/trusted.gpg.d/curtin-daily-ppa.asc"
             local key="0x1bc30f715a3b861247a81a5e55fe7c8c0165013e"
             local keyserver="keyserver.ubuntu.com"
             local keyurl="https://${keyserver}/pks/lookup?op=get&search=${key}";
             inside "$name" sh -c "
                 echo deb $url $release main > $lfile &&
-                wget -q \"$keyurl\" -O $kfile" ||
+                wget -q \"$keyurl\" -O - | gpg --dearmour - | apt-key add -" ||
                 fail "failed to add $daily_ppa repository manually"
             if [ "$getsource" != "none" ]; then
                 inside "$name" sh -c "