diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff index c21c05b..7933fd1 100644 --- a/vbox-vboxadd-init-script.diff +++ b/vbox-vboxadd-init-script.diff @@ -86,3 +86,22 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh fi if running_vboxguest; then rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" +@@ -464,16 +447,8 @@ extra_setup() + # setup_script + setup() + { +- setup_modules +- mod_succ="$?" +- extra_setup +- if [ "$mod_succ" -eq "0" ]; then +- if running_vboxguest || running_vboxadd; then +- printf "You should restart your guest to make sure the new modules are actually used\n\n" +- else +- start +- fi +- fi ++ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged." ++ succ_msg + } + + # cleanup_script diff --git a/vbox-vboxdrv-init-script.diff b/vbox-vboxdrv-init-script.diff index ba66436..9f60a2a 100644 --- a/vbox-vboxdrv-init-script.diff +++ b/vbox-vboxdrv-init-script.diff @@ -51,3 +51,53 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi +@@ -279,48 +273,8 @@ stop_vms() + # setup_script + setup() + { +- stop +- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" +- $DODKMS uninstall > $LOG +- succ_msg +- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then +- begin_msg "Removing old VirtualBox netadp kernel module" +- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null +- succ_msg +- fi +- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then +- begin_msg "Removing old VirtualBox netflt kernel module" +- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null +- succ_msg +- fi +- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then +- begin_msg "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_msg "Trying to register the VirtualBox kernel modules using DKMS" +- if ! $DODKMS install >> $LOG; then +- fail_msg "Failed, trying without DKMS" +- begin_msg "Recompiling VirtualBox kernel modules" +- if ! $BUILDVBOXDRV \ +- --save-module-symvers /tmp/vboxdrv-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" +- fi +- if ! $BUILDVBOXNETFLT \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" +- fi +- if ! $BUILDVBOXNETADP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" +- fi +- fi +- rm -f /etc/vbox/module_not_compiled ++ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged." + succ_msg +- start + } + + dmnstatus() diff --git a/virtualbox.changes b/virtualbox.changes index 7d338bc..2340cd3 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 19 13:49:49 UTC 2011 - mseben@gmail.com + +- disable setup parameter for init scripts + ------------------------------------------------------------------- Wed Jan 19 07:32:14 UTC 2011 - mseben@gmail.com