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

[svn at pcbsd.org]

Author: kris
Date: 2010-03-31 06:19:11 -0700 (Wed, 31 Mar 2010)
New Revision: 6478

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

Fixed up virtualbox port, needs to load some additional modules for networking



Modified: pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.RemoveScript.sh	2010-03-30 19:30:58 UTC (rev 6477)
+++ pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.RemoveScript.sh	2010-03-31 13:19:11 UTC (rev 6478)
@@ -9,10 +9,14 @@
 
 # Remove the kmod and unload it
 kldunload vboxdrv
+kldunload vboxadp
+kldunload vboxflt
 rm /boot/modules/vboxdrv.ko
+rm /boot/modules/vboxadp.ko
+rm /boot/modules/vboxflt.ko
 
 # Save the kernel module to load at bootup
-cat /boot/loader.conf | grep -v "vboxdrv_load" > /tmp/loader.conf
+cat /boot/loader.conf | grep -v "^vbox" > /tmp/loader.conf
 mv /tmp/loader.conf /boot/loader.conf
 
 rm /Programs/bin/VBoxBFE

Modified: pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh	2010-03-30 19:30:58 UTC (rev 6477)
+++ pbibuild/modules/emulators/virtualbox-ose/overlay-dir/PBI.SetupScript.sh	2010-03-31 13:19:11 UTC (rev 6478)
@@ -13,13 +13,15 @@
 #########################################
 
 # Link the kernel module and load it and load aio as well
-cp /Programs/${PROGDIR}/modules/vboxdrv.ko /boot/modules/vboxdrv.ko
+cp /Programs/${PROGDIR}/modules/* /boot/modules/
 
 
 # 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
 mv /tmp/loader.conf /boot/loader.conf
 
 # Now add the user group

Modified: pbibuild/modules/emulators/virtualbox-ose/pbi.conf
===================================================================
--- pbibuild/modules/emulators/virtualbox-ose/pbi.conf	2010-03-30 19:30:58 UTC (rev 6477)
+++ pbibuild/modules/emulators/virtualbox-ose/pbi.conf	2010-03-31 13:19:11 UTC (rev 6478)
@@ -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