Navigation

← Previous Changeset
Next Changeset →

Changeset 5859

Timestamp:

11/28/07 10:42:07 (9 months 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.

Files:

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

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/debian/preinst

r5452	r5859
6	6
7	7	# check for old vboxdrv modules
8		if find /lib/modules -name vboxdrv\* 2>/dev/null\|grep -q vboxdrv; then
	8	if find /lib/modules -name "vboxdrv\.*" 2>/dev/null\|grep -q vboxdrv; then
9	9	# old modules found
10	10	db_get virtualbox-ose/delete-old-modules
…	…
13	13	Old vboxdrv kernel modules found in
14	14	EOF
15		find /lib/modules -name vboxdrv\* 2>/dev/null\|sed "s+$.*$+ \1+g"
	15	find /lib/modules -name "vboxdrv\." 2>/dev/null\|sed "s+$.$+ \1+g"
16	16	cat << EOF
17	17	Removing of these modules denied by debconf setting
…	…
22	22	db_get virtualbox-ose/delete-old-modules
23	23	if [ "$RET" = "true" ]; then
24		find /lib/modules -name vboxdrv\* 2>/dev/null\|xargs rm -f 2>/dev/null
	24	find /lib/modules -name "vboxdrv\.*" 2>/dev/null\|xargs rm -f 2>/dev/null
25	25	fi
26	26	fi

trunk/debian/vboxdrv.init.tmpl

r5739	r5859
80	80	running()
81	81	{
82		lsmod \| grep -q ~~$MODNAME[^_-]~~
	82	lsmod \| grep -q "$MODNAME[^_-]"
83	83	}
84	84
…	…
152	152	setup)
153	153	stop
	154	if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null\|grep -q vboxdrv; then
	155	log_action_begin_msg "Removing old VirtualBox kernel module"
	156	find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null\|xargs rm -f 2>/dev/null
	157	log_action_end_msg 0
	158	fi
154	159	log_daemon_msg "Recompiling VirtualBox kernel module" "$MODNAME"
155	160	if ! /usr/share/virtualbox-ose/src/build_in_tmp install > $LOG 2>&1; then

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

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