[svn-commits] kpfleming: linux/trunk r4575 - in /linux/trunk: ./ build_tools/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jul  8 15:18:38 2008
New Revision: 4575

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4575
Log:
minor improvements to uninstall-modules: add the PID to the temporary file name to make it less easy to accidentally duplicate, only search directories where we expect that DAHDI or Zaptel modules might be found (known installation locations, even old ones), and always uninstall old DAHDI modules before installing new ones, in case a module is no longer in the tree and shouldn't be left installed

Modified:
    linux/trunk/Makefile
    linux/trunk/build_tools/uninstall-modules

Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4575&r1=4574&r2=4575
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Tue Jul  8 15:18:38 2008
@@ -173,6 +173,7 @@
 		rm -rf /lib/modules/$(KVERS)/zaptel; \
 		echo "done."; \
 	fi
+	build_tools/uninstall-modules dahdi $(KVERS)
 endif
 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
 	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :

Modified: linux/trunk/build_tools/uninstall-modules
URL: http://svn.digium.com/view/dahdi/linux/trunk/build_tools/uninstall-modules?view=diff&rev=4575&r1=4574&r2=4575
==============================================================================
--- linux/trunk/build_tools/uninstall-modules (original)
+++ linux/trunk/build_tools/uninstall-modules Tue Jul  8 15:18:38 2008
@@ -45,13 +45,16 @@
 
 while test "${founddep}" = "1"; do
     founddep=0
-    find /lib/modules/${2} -name \*.ko -print > /tmp/modlist
-    exec 9<&0 < /tmp/modlist
+    find /lib/modules/${2}/misc -name \*.ko -print > /tmp/modlist.$$ 2> /dev/null
+    find /lib/modules/${2}/extra -name \*.ko -print >> /tmp/modlist.$$ 2> /dev/null
+    find /lib/modules/${2}/zaptel -name \*.ko -print >> /tmp/modlist.$$ 2> /dev/null
+    find /lib/modules/${2}/dahdi -name \*.ko -print >> /tmp/modlist.$$ 2> /dev/null
+    exec 9<&0 < /tmp/modlist.$$
     while read mod; do
 	checkmod ${mod}
     done
     exec 0<&9 9<&-
-    rm /tmp/modlist
+    rm /tmp/modlist.$$
 done
 
 if test -n "${rmlist}"; then