Changeset 5859 in vbox

Timestamp:

Nov 28, 2007 9:42:07 AM (17 years ago)

Author:

vboxsync

Message:

deb/rpm/run: Remove any old kernel module of the current kernel before compiling a new one in '/etc/init.d/vboxdrv setup'. Use "vboxdrv\.*" instead of vboxdrv\* for finding them.

Location:

trunk

Files:

• debian/preinst (modified) (3 diffs)
• debian/vboxdrv.init.tmpl (modified) (2 diffs)
• src/VBox/Installer/linux/vboxdrv.sh (modified) (1 diff)

trunk/debian/preinst

@@ -6 +6 @@
 
 # check for old vboxdrv modules
-if find /lib/modules -name vboxdrv\* 2>/dev/null|grep -q vboxdrv; then
+if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
   # old modules found
   db_get virtualbox-ose/delete-old-modules
@@ -13 +13 @@
 Old vboxdrv kernel modules found in
 EOF
-    find /lib/modules -name vboxdrv\* 2>/dev/null|sed "s+\(.*\)+  \1+g"
+    find /lib/modules -name "vboxdrv\.*" 2>/dev/null|sed "s+\(.*\)+  \1+g"
     cat << EOF
 Removing of these modules denied by debconf setting
@@ -22 +22 @@
     db_get virtualbox-ose/delete-old-modules
     if [ "$RET" = "true" ]; then
-      find /lib/modules -name vboxdrv\* 2>/dev/null|xargs rm -f 2>/dev/null
+      find /lib/modules -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
     fi
   fi

trunk/debian/vboxdrv.init.tmpl

@@ -80 +80 @@
 running()
 {
-  lsmod | grep -q $MODNAME[^_-]
+  lsmod | grep -q "$MODNAME[^_-]"
 }
 
@@ -152 +152 @@
   setup)
     stop
+    if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
+      log_action_begin_msg "Removing old VirtualBox kernel module"
+      find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+      log_action_end_msg 0
+    fi
     log_daemon_msg "Recompiling VirtualBox kernel module" "$MODNAME"
     if ! /usr/share/virtualbox-ose/src/build_in_tmp install > $LOG 2>&1; then

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

@@ -190 +190 @@
     . "$CONFIG"
     stop
+    if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
+      begin "Removing old VirtualBox kernel module "
+      find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+      succ_msg
+    fi
     begin "Recompiling VirtualBox kernel module "
     if ! $INSTALL_DIR/src/build_in_tmp install > /var/log/vbox-install.log 2>&1; then