Changeset 32237 in vbox

Timestamp:

Sep 3, 2010 2:59:00 PM (14 years ago)

Author:

vboxsync

Message:

deb/rpm: register modules at DKMS if we don't need to compile during installation

Location:

trunk

Files:

• debian/postinst.in (modified) (1 diff)
• src/VBox/Installer/linux/debian/postinst.in (modified) (1 diff)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (2 diffs)

trunk/debian/postinst.in

@@ -133 +133 @@
 
     BUILD_MODULES=0
+    REGISTER_MODULES=1
     # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
-    if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko -a "$INSTALL_NO_VBOXDRV" != "1" ]; then
-      db_get virtualbox/module-compilation-allowed
-      if [ "$RET" = "false" ]; then
-        cat << EOF
+    if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
+      REGISTER_MODULES=0
+      if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
+        db_get virtualbox/module-compilation-allowed
+        if [ "$RET" = "false" ]; then
+          cat << EOF
 Unable to find a precompiled module for the current kernel
 though module compilation denied by debconf setting.
 EOF
-      else
-        db_input low virtualbox/module-compilation-allowed || true
-        db_go || true
-        db_get virtualbox/module-compilation-allowed
-        if [ "$RET" = "true" ]; then
-          BUILD_MODULES=1
+        else
+          db_input low virtualbox/module-compilation-allowed || true
+          db_go || true
+          db_get virtualbox/module-compilation-allowed
+          if [ "$RET" = "true" ]; then
+            BUILD_MODULES=1
+          fi
         fi
       fi
     fi
 
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      if [ $BUILD_MODULES -eq 1 ]; then
+    if [ $BUILD_MODULES -eq 1 ]; then
+      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
         invoke-rc.d vboxdrv setup || true
       else
-        invoke-rc.d vboxdrv start || exit $?
+        /etc/init.d/vboxdrv setup || true
       fi
     else
-      if [ $BUILD_MODULES -eq 1 ]; then
-        /etc/init.d/vboxdrv setup || true
+      # shipped modules found, register sources at DKMS anyway
+      if [ $REGISTER_MODULES -eq 1 ]; then
+        DKMS=`which dkms 2>/dev/null`
+        if [ -n "$DKMS" ]; then
+          $DKMS add -m vboxhost -v %VER% > /dev/null 2>&1 || true
+        fi
+      fi
+      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        invoke-rc.d vboxdrv start || exit $?
       else
         /etc/init.d/vboxdrv start || exit $?

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -133 +133 @@
 
     BUILD_MODULES=0
+    REGISTER_MODULES=1
     # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
-    if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko -a "$INSTALL_NO_VBOXDRV" != "1" ]; then
-      db_get virtualbox/module-compilation-allowed
-      if [ "$RET" = "false" ]; then
-        cat << EOF
+    if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
+      REGISTER_MODULES=0
+      if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
+        db_get virtualbox/module-compilation-allowed
+        if [ "$RET" = "false" ]; then
+          cat << EOF
 Unable to find a precompiled module for the current kernel
 though module compilation denied by debconf setting.
 EOF
-      else
-        db_input low virtualbox/module-compilation-allowed || true
-        db_go || true
-        db_get virtualbox/module-compilation-allowed
-        if [ "$RET" = "true" ]; then
-          BUILD_MODULES=1
+        else
+          db_input low virtualbox/module-compilation-allowed || true
+          db_go || true
+          db_get virtualbox/module-compilation-allowed
+          if [ "$RET" = "true" ]; then
+            BUILD_MODULES=1
+          fi
         fi
       fi
     fi
 
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      if [ $BUILD_MODULES -eq 1 ]; then
+    if [ $BUILD_MODULES -eq 1 ]; then
+      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
         invoke-rc.d vboxdrv setup || true
       else
-        invoke-rc.d vboxdrv start || exit $?
+        /etc/init.d/vboxdrv setup || true
       fi
     else
-      if [ $BUILD_MODULES -eq 1 ]; then
-        /etc/init.d/vboxdrv setup || true
+      # shipped modules found, register sources at DKMS anyway
+      if [ $REGISTER_MODULES -eq 1 ]; then
+        DKMS=`which dkms 2>/dev/null`
+        if [ -n "$DKMS" ]; then
+          $DKMS add -m vboxhost -v %VER% > /dev/null 2>&1 || true
+        fi
+      fi
+      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        invoke-rc.d vboxdrv start || exit $?
       else
         /etc/init.d/vboxdrv start || exit $?

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -267 +267 @@
 # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
 BUILD_MODULES=0
-if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko -a "$INSTALL_NO_VBOXDRV" != "1" ]; then
-  # compile problem
-  cat << EOF
+REGISTER_MODULES=1
+if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
+  REGISTER_MODULES=0
+  if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
+    # compile problem
+    cat << EOF
 No precompiled module for this kernel found -- trying to build one. Messages
 emitted during module compilation will be logged to $LOG.
 
 EOF
-  BUILD_MODULES=1
+    BUILD_MODULES=1
+  fi
 fi
 # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules
@@ -288 +292 @@
   /etc/init.d/vboxdrv setup || true
 else
+  if [ $REGISTER_MODULES -eq 1 ]; then
+    DKMS=`which dkms 2>/dev/null`
+    if [ -n "$DKMS" ]; then
+      $DKMS remove -m vboxhost -v %VER% --all > /dev/null 2>&1 || true
+    fi
+  fi
   /etc/init.d/vboxdrv start > /dev/null
 fi