[zaptel-commits] kpfleming: branch 1.4 r4401 - in /branches/1.4: ./ build_tools/

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Tue Jul  8 15:20:37 2008
New Revision: 4401

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4401
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 Zaptel modules before installing new ones, in case a module is no longer in the tree and shouldn't be left installed

Modified:
    branches/1.4/Makefile
    branches/1.4/build_tools/uninstall-modules

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=4401&r1=4400&r2=4401
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Tue Jul  8 15:20:37 2008
@@ -538,6 +538,7 @@
 		rm -rf /lib/modules/$(KVERS)/dahdi; \
 		echo "done."; \
 	fi
+	build_tools/uninstall-modules dahdi $(KVERS)
 endif
 	$(KMAKE_INST)
 endif

Modified: branches/1.4/build_tools/uninstall-modules
URL: http://svn.digium.com/view/zaptel/branches/1.4/build_tools/uninstall-modules?view=diff&rev=4401&r1=4400&r2=4401
==============================================================================
--- branches/1.4/build_tools/uninstall-modules (original)
+++ branches/1.4/build_tools/uninstall-modules Tue Jul  8 15:20:37 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