diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-07-08 20:20:37 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-07-08 20:20:37 +0000 |
| commit | f91e402f967c5b27edd38bdca79dc54807103755 (patch) | |
| tree | e3e73c837e1f089821df9a69c9f5f452ce045df9 | |
| parent | 0f27521bc7d0abc3604c5ca0164bbc95178cdae5 (diff) | |
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
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4401 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | build_tools/uninstall-modules | 9 |
2 files changed, 7 insertions, 3 deletions
@@ -538,6 +538,7 @@ ifndef DESTDIR rm -rf /lib/modules/$(KVERS)/dahdi; \ echo "done."; \ fi + build_tools/uninstall-modules dahdi $(KVERS) endif $(KMAKE_INST) endif 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 |