[Fai-commit] r5914 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-07-30 04:08:49 +0000 (Fri, 30 Jul 2010)
New Revision: 5914

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: remove diversion of discover-modprobe

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-30 04:07:08 UTC (rev 5913)
+++ trunk/bin/make-fai-nfsroot	2010-07-30 04:08:49 UTC (rev 5914)
@@ -391,7 +391,6 @@
 	fdivert /usr/sbin/update-initramfs
 	ln -sf /bin/true $NFSROOT/usr/sbin/update-initramfs
     fi
-    fdivert /sbin/discover-modprobe
     $ROOTCMD apt-get -y dist-upgrade
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -414,8 +413,6 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 umount_dirs() {
 
-    [ -f $NFSROOT/usr/sbin/dpkg-divert ] && 
-       LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /sbin/discover-modprobe
     cd /
     [ -d $NFSROOT/proc/self ] && umount $NFSROOT/proc 
     [ -d $NFSROOT/sys/class ] && umount $NFSROOT/sys

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-30 04:07:08 UTC (rev 5913)
+++ trunk/debian/changelog	2010-07-30 04:08:49 UTC (rev 5914)
@@ -96,6 +96,7 @@
     fai-start-stop-daemon
   * get-config-dir: change error message
   * make-fai-nfsroot: minor cleanup
+  * make-fai-nfsroot: remove diversion of discover-modprobe
     
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3