[Fai-commit] r5926 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2010-08-01 03:14:10 +0000 (Sun, 01 Aug 2010)
New Revision: 5926

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines
   trunk/lib/updatebase
Log:
updatebase, subroutines: move code for loading apt keys to updatebase

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-31 20:54:46 UTC (rev 5925)
+++ trunk/debian/changelog	2010-08-01 03:14:10 UTC (rev 5926)
@@ -1,4 +1,4 @@
-fai (3.4~beta16) unstable; urgency=low
+fai (3.4~beta18) unstable; urgency=low
 
   [ Thomas Lange ]
   * get-config-dir-http: new script to get a tarball of the config space
@@ -102,6 +102,7 @@
   * savelog.LAST: add ignore pattern
   * ftar: die() subroutine now takes exit code, code cleanup
   * fai-mirror: code cleanup
+  * updatebase, subroutines: move code for loading apt keys to updatebase
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2010-07-31 20:54:46 UTC (rev 5925)
+++ trunk/lib/subroutines	2010-08-01 03:14:10 UTC (rev 5926)
@@ -878,15 +878,7 @@
 
     # maybe the base system is not up to date
 
-    local keyfile
-    # add apt keys for signed repositories
-    for keyfile in `cd $FAI/package_config; ls *.asc 2>/dev/null`; do
-	echo -n "Loading APT key from $keyfile "
-	cat $FAI/package_config/$keyfile | $ROOTCMD apt-key add -
-    done
-
     if [ "$verbose" ]; then
-	echo "Updating base"
 	updatebase </dev/null 2>&1 | tee -a $LOGDIR/software.log
         task_error 474 ${PIPESTATUS[0]}
     else

Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2010-07-31 20:54:46 UTC (rev 5925)
+++ trunk/lib/updatebase	2010-08-01 03:14:10 UTC (rev 5926)
@@ -6,6 +6,15 @@
 # update packages (from base.tgz) to their newest version
 # is almost Debian specific
 
+echo "Updating base"
+
+# add apt keys for signed repositories
+# TODO: add keys by using classes as file names
+for keyfile in `cd $FAI/package_config; ls *.asc 2>/dev/null`; do
+    echo -n "Loading APT key from $keyfile "
+    cat $FAI/package_config/$keyfile | $ROOTCMD apt-key add -
+done
+
 # first setup the environment in /target
 if [ "$FAI_ACTION" = "install" -o "$FAI_ACTION" = "dirinstall" ]; then
     # some packages must access /proc even in chroot environment