Changeset 43749 in vbox

Timestamp:

Oct 25, 2012 7:35:49 PM (12 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: do not try to use DKMS in the Additions either if it is not installed (cosmetic).

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (2 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -360 +360 @@
 cleanup_modules()
 {
-    begin "Removing existing VirtualBox DKMS kernel modules"
-    $DODKMS uninstall $OLDMODULES > $LOG
-    succ_msg
+    if [ -n "$(which dkms 2>/dev/null)" ]; then
+        begin "Removing existing VirtualBox DKMS kernel modules"
+        $DODKMS uninstall $OLDMODULES > $LOG
+        succ_msg
+    fi
     begin "Removing existing VirtualBox non-DKMS kernel modules"
     for i in $OLDMODULES; do
@@ -378 +380 @@
 
     # Short cut out if a dkms build succeeds
-    if $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
+    if [ -n "$(which dkms 2>/dev/null)" ] &&
+       $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
         succ_msg
         return 0