diff --git a/repos/ports/run/test.vbox b/repos/ports/run/test.vbox index 12181b45e..022421e77 100644 --- a/repos/ports/run/test.vbox +++ b/repos/ports/run/test.vbox @@ -57,71 +57,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 096c33cf1..4a35e44b6 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -6,7 +6,10 @@ set use_serial 1 set use_vbox4 1 set use_vbox5 [expr !$use_vbox4] +# use_gui starts two VMs set use_gui 0 +# need a nic bridge for 2 VMs +set use_bridge [expr $use_net && $use_gui] set build_components { core init @@ -35,6 +38,7 @@ lappend_if [expr $use_serial] build_components server/log_terminal lappend_if [have_spec x86] build_components drivers/rtc lappend_if [expr $use_net] build_components drivers/nic +lappend_if [expr $use_bridge] build_components server/nic_bridge lappend_if [expr $use_gui] build_components server/report_rom lappend_if [expr $use_gui] build_components server/nitpicker @@ -136,6 +140,18 @@ append_if [expr $use_serial] config { } +append_if [expr $use_bridge] config { + + + + + + + + + +} + append_if [expr $use_gui] config { @@ -234,6 +250,7 @@ append_if [expr $use_gui] config { + @@ -262,6 +279,9 @@ append config { } +append_if [expr $use_bridge] config { + } + append_if [expr $use_gui] config { @@ -301,6 +321,7 @@ append boot_modules { } append_if [expr $use_net] boot_modules { nic_drv } +append_if [expr $use_bridge] boot_modules { nic_bridge } append_if [expr $use_serial] boot_modules { log_terminal } append_platform_drv_boot_modules