[Fai-commit] r4005 - trunk/lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-09-22 09:41:40 +0000 (Fri, 22 Sep 2006)
New Revision: 4005

Modified:
   trunk/lib/subroutines-linux
   trunk/lib/updatebase
Log:
remove duplicate copy command


Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-09-22 09:41:24 UTC (rev 4004)
+++ trunk/lib/subroutines-linux	2006-09-22 09:41:40 UTC (rev 4005)
@@ -187,7 +187,6 @@
       fi
     fi
     [ -d $FAI_ETC_DIR/apt ] && cp -r $FAI_ETC_DIR/apt/* $FAI_ROOT/etc/apt/
-    [ -d $FAI_ETC_DIR/apt/apt.conf.d ] && cp -r $FAI_ETC_DIR/apt/apt.conf.d/*fai $FAI_ROOT/etc/apt/apt.conf.d
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_updatebase() {

Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2006-09-22 09:41:24 UTC (rev 4004)
+++ trunk/lib/updatebase	2006-09-22 09:41:40 UTC (rev 4005)
@@ -13,7 +13,6 @@
     fai-divert -a /sbin/init /usr/sbin/liloconfig /usr/sbin/invoke-rc.d
     # fake some more programs
     fai-divert -a /etc/init.d/nis /sbin/start-stop-daemon /usr/sbin/policy-rc.d
-    # this will not work during dirinst
     cp /sbin/fai-start-stop-daemon $FAI_ROOT/sbin/start-stop-daemon
     # never start any daemons inside chroot during installtion
     cat > $FAI_ROOT/usr/sbin/policy-rc.d <<EOF