[Fai-commit] r6629 - trunk/lib

[Thomas Lange]

Author: lange
Date: 2011-07-21 10:47:53 +0000 (Thu, 21 Jul 2011)
New Revision: 6629

Modified:
   trunk/lib/updatebase
Log:
print a warning if some *.asc file are not used

now only files matching a class name are used


Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2011-07-21 09:48:33 UTC (rev 6628)
+++ trunk/lib/updatebase	2011-07-21 10:47:53 UTC (rev 6629)
@@ -9,12 +9,28 @@
 echo "Updating base"
 
 # add apt keys for signed repositories
+
+declare -A keys
+# store all available *.asc files
+for f in `cd $FAI/package_config; ls *.asc 2>/dev/null`; do
+    keys["$f"]=1
+done
+
 for keyfile in $classes; do
     [ ! -f $FAI/package_config/$keyfile ] && continue
     echo -n "Loading APT key from $keyfile "
     cat $FAI/package_config/$keyfile | $ROOTCMD apt-key add -
+    unset keys["$keyfile"]
 done
 
+if [ -n "${asclist[@]}" ]; then
+    echo "Following signatures are not loaded:"
+    for i in "${!keys[@]}"; do
+	echo "$i"
+    done
+    echo "You have to rename them to match a class name."
+fi
+
 # first setup the environment in /target
 if [ "$FAI_ACTION" = "install" -o "$FAI_ACTION" = "dirinstall" ]; then
     # some packages must access /proc even in chroot environment