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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4575 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 6 insertions, 3 deletions

diff --git a/build_tools/uninstall-modules b/build_tools/uninstall-modules
index 45c635c..02b89c9 100755
--- a/build_tools/uninstall-modules
+++ b/build_tools/uninstall-modules
@@ -45,13 +45,16 @@ checkmod() {
 
 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