Also install apt keys in binary (.gpg) format in /etc/apt/trusted.gpg.d

faiproject · Apr 11, 2018 · 1323488 · 1323488
1 parent 6e310f7
commit 1323488
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/subroutines b/lib/subroutines
@@ -1106,9 +1106,12 @@ EOF
 
     # add apt keys for all classes
     for keyfile in ${classes:-}; do
-        [ ! -f $FAI/package_config/$keyfile.asc ] && continue
-        echo -n "Copying APT key from $keyfile.asc "
-        cp $FAI/package_config/$keyfile.asc $FAI_ROOT/etc/apt/trusted.gpg.d/
+        keyfile_name=""
+        [ -f $FAI/package_config/$keyfile.gpg ] && keyfile_name=$keyfile.gpg
+        [ -f $FAI/package_config/$keyfile.asc ] && keyfile_name=$keyfile.asc
+        [ -z $keyfile_name ] && continue
+        echo -n "Copying APT key from $keyfile_name "
+        cp $FAI/package_config/$keyfile_name $FAI_ROOT/etc/apt/trusted.gpg.d/
     done
 
     # mount Debian mirror via NFS if needed