[Fai-commit] r4357 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-23 20:05:37 +0000 (Sat, 23 Jun 2007)
New Revision: 4357

Modified:
   trunk/bin/make-fai-nfsroot
Log:
divert update-initramfs so it's only called once


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-06-22 20:31:50 UTC (rev 4356)
+++ trunk/bin/make-fai-nfsroot	2007-06-23 20:05:37 UTC (rev 4357)
@@ -147,6 +147,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 install_kernel_nfsroot() {
 
+    LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-initramfs
     $ROOTCMD update-initramfs -k all -t -u
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -324,7 +325,7 @@
     rm -rf $NFSROOT/etc/apm
     mount -t proc /proc $NFSROOT/proc
 
-    fdivert /sbin/start-stop-daemon /sbin/discover-modprobe
+    fdivert /sbin/start-stop-daemon /sbin/discover-modprobe /usr/sbin/update-initramfs
     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin
     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
     $ROOTCMD apt-get -y dist-upgrade