Changeset 69428 in vbox for trunk/src/VBox/Installer

Timestamp:

Oct 27, 2017 1:06:27 PM (7 years ago)

Author:

vboxsync

Message:

Installer/linux/vboxdrv.sh: always clean up empty kernel driver misc folders.
bugref:3809: Linux installer maintenance
When we clean up and remove our host kernel drivers, we also check to see if
we are leaving behind an empty misc folder in the kernel driver tree, and if
so we delete it. However we were not always as careful in the past, with
the result that many systems have a number of driver folders for different
kernel versions, empty except for an empty misc folder. This change makes
us delete those if we find them during clean-up.

File:

• trunk/src/VBox/Installer/linux/vboxdrv.sh (modified) (1 diff)

trunk/src/VBox/Installer/linux/vboxdrv.sh

@@ -384 +384 @@
             rm -f "${i}/misc/vboxdrv.ko" "${i}/misc/vboxnetadp.ko" \
                   "${i}/misc/vboxnetflt.ko" "${i}/misc/vboxpci.ko"
-            # Remove the kernel version folder if it was empty except for us.
-            test   "`echo ${i}/misc/* ${i}/misc/.?* ${i}/* ${i}/.?*`" \
-                 = "${i}/misc/* ${i}/misc/.. ${i}/misc ${i}/.." &&
-                rmdir "${i}/misc" "${i}"  # We used to leave empty folders.
             version=`expr "${i}" : "/lib/modules/\(.*\)"`
             depmod -a "${version}"
         fi
+        # Remove the kernel version folder if it was empty except for us.
+        test   "`echo ${i}/misc/* ${i}/misc/.?* ${i}/* ${i}/.?*`" \
+             = "${i}/misc/* ${i}/misc/.. ${i}/misc ${i}/.." &&
+            rmdir "${i}/misc" "${i}"  # We used to leave empty folders.
     done
 }