[Fai-commit] r4490 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-08-11 15:39:28 +0000 (Sat, 11 Aug 2007)
New Revision: 4490

Modified:
   trunk/bin/make-fai-nfsroot
Log:
replace update-initramfs with symlink to /bin/true, because ubuntu
packages lvm2 and initramfs-tools do not like just to divert update-initramfs


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-08-11 11:24:01 UTC (rev 4489)
+++ trunk/bin/make-fai-nfsroot	2007-08-11 15:39:28 UTC (rev 4490)
@@ -145,6 +145,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 install_kernel_nfsroot() {
 
+    rm $NFSROOT/usr/sbin/update-initramfs
     LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-initramfs
     $ROOTCMD update-initramfs -k all -t -u
 }
@@ -306,6 +307,7 @@
     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
+    ln -s /bin/true $NFSROOT/usr/sbin/fai
     $ROOTCMD apt-get -y dist-upgrade
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -424,6 +426,7 @@
     trap "true" EXIT
     echo "Installing new kernel into the nfsroot."
     fdivert /usr/sbin/update-initramfs
+    ln -s /bin/true $NFSROOT/usr/sbin/fai
     LC_ALL=C add_packages_nfsroot
     kernel_install
     exit