[Fai-commit] r3363 - trunk/lib

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-04-01 16:43:05 +0000 (Sat, 01 Apr 2006)
New Revision: 3363

Modified:
   trunk/lib/subroutines-linux
Log:
revert patch, that moved cp /etc/apt/* from task_prepareapt to
task_updatebase, causes problems when somebody like to use fcopy for
these files in a hook


Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-03-31 22:02:39 UTC (rev 3362)
+++ trunk/lib/subroutines-linux	2006-04-01 16:43:05 UTC (rev 3363)
@@ -5,7 +5,7 @@
 # subroutine definitions for linux
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2005 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2005-2006 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 set_disk_info() {
@@ -136,6 +136,7 @@
       echo -e "$IPADDR\t$HOSTNAME.$DOMAIN $HOSTNAME" >>$FAI_ROOT/etc/hosts
       echo $HOSTNAME >$FAI_ROOT/etc/hostname
     fi
+    [ -d /etc/apt ] && cp -r /etc/apt/* $FAI_ROOT/etc/apt/
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_updatebase() {
@@ -144,7 +145,6 @@
     echo "Updating base"
     # try to mount the config space, since it can also contain Debian Packages
     # in /fai/files/packages 
-    cp -r /etc/apt/* $FAI_ROOT/etc/apt/
     [ "$FAI_ROOT" = "/" ] || mount --bind $FAI $FAI_ROOT/$FAI
     if [ "$debug" ]; then
 	updatebase | tee -a $LOGDIR/updatebase.log 2>&1