Two linux run script: Enable network

This commit is contained in:
Sebastian Sumpf 2012-07-10 15:24:03 +02:00 committed by Norman Feske
parent e52a33783a
commit a55f04a160

View File

@ -88,9 +88,15 @@ append_if [have_spec ps2] config {
append_if [expr ![have_spec ps2] && [have_spec usb]] config { append_if [expr ![have_spec ps2] && [have_spec usb]] config {
<start name="input_drv"> <start name="input_drv">
<binary name="usb_drv"/> <binary name="usb_drv"/>
<resource name="RAM" quantum="3M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Input"/></provides> <provides>
<config> <hid/> </config> <service name="Input"/>
<service name="Nic" />
</provides>
<config>
<hid/>
<nic mac="2e:60:90:0c:4e:01" />
</config>
</start> } </start> }
append_if [have_spec x86] config { append_if [have_spec x86] config {
@ -106,16 +112,14 @@ append_if [have_spec lan9118] config {
</start> } </start> }
append config { append config {
<!--
<start name="nic_bridge"> <start name="nic_bridge">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides><service name="Nic"/></provides> <provides><service name="Nic"/></provides>
<route> <route>
<service name="Nic"> <child name="nic_drv"/> </service> <service name="Nic"> <child name="input_drv"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
-->
<start name="nitpicker"> <start name="nitpicker">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides><service name="Nitpicker"/></provides> <provides><service name="Nitpicker"/></provides>
@ -173,7 +177,7 @@ append config {
<route> <route>
<service name="Input"> <child name="linux.1"/> </service> <service name="Input"> <child name="linux.1"/> </service>
<service name="Framebuffer"> <child name="linux.1"/> </service> <service name="Framebuffer"> <child name="linux.1"/> </service>
<!-- <service name="Nic"> <child name="nic_bridge"/> </service> --> <service name="Nic"> <child name="nic_bridge"/> </service>
<service name="LOG"> <child name="terminal_log"/> </service> <service name="LOG"> <child name="terminal_log"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
@ -185,7 +189,7 @@ append config {
<route> <route>
<service name="Input"> <child name="linux.2"/> </service> <service name="Input"> <child name="linux.2"/> </service>
<service name="Framebuffer"> <child name="linux.2"/> </service> <service name="Framebuffer"> <child name="linux.2"/> </service>
<!-- <service name="Nic"> <child name="nic_bridge"/> </service> --> <service name="Nic"> <child name="nic_bridge"/> </service>
<service name="LOG"> <child name="terminal_log"/> </service> <service name="LOG"> <child name="terminal_log"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
@ -241,4 +245,4 @@ append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 -net user "
# #
# Execute test case # Execute test case
# #
run_genode_until forever #run_genode_until forever