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

[Thomas Lange]

Author: lange
Date: 2009-10-23 13:58:35 +0000 (Fri, 23 Oct 2009)
New Revision: 5593

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines
Log:
  add keys after copying /etc/apt to /target, do copy 10fai

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-23 13:22:55 UTC (rev 5592)
+++ trunk/debian/changelog	2009-10-23 13:58:35 UTC (rev 5593)
@@ -19,6 +19,7 @@
     set trap for softupdate after checking if second instance is running
     check if test.log exists before using grep
     add APT keys from package_config/*.asc files (closes: #363701,#504018)
+    add keys after copying /etc/apt to /target, do copy 10fai
   * fai-class: add string warning to message
   * task_sysinfo: call blkid on all disks
   * fcopy: add die() after open command

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2009-10-23 13:22:55 UTC (rev 5592)
+++ trunk/lib/subroutines	2009-10-23 13:58:35 UTC (rev 5593)
@@ -830,6 +830,13 @@
       fi
     fi
 
+
+    # during normal installation, we need sources.list from /etc/apt
+    # currently /target/etc/apt gets overwritten by the contents of /etc/apt from inside the nfsroot
+    [ $do_init_tasks -eq 1 ] && FAI_ETC_DIR=/etc
+    [ -d $FAI_ETC_DIR/apt ] && cp -r $FAI_ETC_DIR/apt/* $FAI_ROOT/etc/apt/
+
+    rm -f $FAI_ROOT/etc/apt/apt.conf.d/10fai # disable AllowUnauthenticated, which was used in the nfsroot
     if [ X$FAI_ALLOW_UNSIGNED = X1 ]; then
 	cat <<EOF > $FAI_ROOT/etc/apt/apt.conf.d/10fai
 APT::Get::AllowUnauthenticated "true";
@@ -843,10 +850,6 @@
 	echo -n "Loading APT key from $keyfile "
 	cat $FAI/package_config/$keyfile | $ROOTCMD apt-key add -
     done
-
-    # during normal installation, we need sources.list from /etc/apt
-    [ $do_init_tasks -eq 1 ] && FAI_ETC_DIR=/etc
-    [ -d $FAI_ETC_DIR/apt ] && cp -r $FAI_ETC_DIR/apt/* $FAI_ROOT/etc/apt/
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_updatebase() {