[PC-BSD Commits] r6985 - in pbibuild/modules/emulators/virtualbox-ose: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2010-06-18 10:36:30 -0700 (Fri, 18 Jun 2010)
New Revision: 6985

Modified:
   pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/emulators/virtualbox-ose/pbi.conf
Log:

Disable some kernel modules from vbox, vboxnetflt causes panic at boot on 8.1-BETA1



Modified: pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh	2010-06-18 09:04:20 UTC (rev 6984)
+++ pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh	2010-06-18 17:36:30 UTC (rev 6985)
@@ -24,9 +24,9 @@
 # Save the kernel module to load at bootup
 cp /boot/loader.conf /boot/loader.conf.orig
 cat /boot/loader.conf | grep -v "vboxdrv_load"  > /tmp/loader.conf
-echo 'vboxnetflt_load="YES"' >> /tmp/loader.conf
 echo 'vboxdrv_load="YES"' >> /tmp/loader.conf
-echo 'vboxnetadp_load="YES"' >> /tmp/loader.conf
+echo '#vboxnetflt_load="YES"' >> /tmp/loader.conf
+echo '#vboxnetadp_load="YES"' >> /tmp/loader.conf
 mv /tmp/loader.conf /boot/loader.conf
 
 # Now add the user group
@@ -80,8 +80,8 @@
 then
   # If on 8.x, load the module now
   kldload /boot/modules/vboxdrv.ko
-  kldload /boot/modules/vboxnetflt.ko
-  kldload /boot/modules/vboxnetadp.ko
+  #kldload /boot/modules/vboxnetflt.ko
+  #kldload /boot/modules/vboxnetadp.ko
 else
   # Seeing kernel panics when loading module on 7.x, needs to load at boot
   kdialog --msgbox "Please reboot before running VirtualBox" --title "VirtualBox Installer"

Modified: pbibuild/modules/emulators/virtualbox-ose/pbi.conf
===================================================================
--- pbibuild/modules/emulators/virtualbox-ose/pbi.conf	2010-06-18 09:04:20 UTC (rev 6984)
+++ pbibuild/modules/emulators/virtualbox-ose/pbi.conf	2010-06-18 17:36:30 UTC (rev 6985)
@@ -35,7 +35,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 # By default we prune the python files used for building,
 # Set this to NO to keep any python files in the resulting PBI