nic_router.run: update to new usage of the VFS tag

Use <config><vfs/></config> instead of <config><libc><vfs/></libc></config>.

Ref #2193
This commit is contained in:
Martin Stein 2017-02-08 16:18:37 +01:00 committed by Christian Helmuth
parent e266e3cf1d
commit a9535d5311

View File

@ -166,12 +166,10 @@ append_if $udp_down_to_down_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="10.0.98.55"
gateway="10.0.98.33" netmask="255.255.255.0"
server_ip="10.0.98.33" server_port="1337">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
server_ip="10.0.98.33" server_port="1337"/>
</config>
</start>
@ -183,11 +181,9 @@ append_if $udp_down_to_down_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="10.0.99.55"
gateway="10.0.99.33" netmask="255.255.255.0" port="1337">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
gateway="10.0.99.33" netmask="255.255.255.0" port="1337"/>
</config>
</start>}
@ -201,12 +197,10 @@ append_if $udp_up_to_down_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="10.0.2.123"
gateway="10.0.2.55" netmask="255.255.255.0"
server_ip="10.0.2.55" server_port="1">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
server_ip="10.0.2.55" server_port="1"/>
</config>
</start>
@ -218,11 +212,9 @@ append_if $udp_up_to_down_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="18.17.16.15"
gateway="18.17.16.14" netmask="255.255.0.0" port="1">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
gateway="18.17.16.14" netmask="255.255.0.0" port="1"/>
</config>
</start>}
@ -236,12 +228,10 @@ append_if $udp_down_to_up_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="217.13.192.2"
gateway="217.13.192.1" netmask="255.255.192.0"
server_ip="10.0.2.70" server_port="65535">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
server_ip="10.0.2.70" server_port="65535"/>
</config>
</start>
@ -253,11 +243,9 @@ append_if $udp_down_to_up_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="10.0.2.70"
netmask="255.255.255.0" gateway="10.0.2.55" port="65535">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
netmask="255.255.255.0" gateway="10.0.2.55" port="65535"/>
</config>
</start>}
@ -271,11 +259,9 @@ append_if $tcp_up_to_down_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config ld_verbose="yes">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="192.168.1.18"
netmask="255.255.255.0" gateway="192.168.1.1" http_port="80">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
netmask="255.255.255.0" gateway="192.168.1.1" http_port="80"/>
</config>
</start>
<start name="http_client_1">
@ -286,11 +272,9 @@ append_if $tcp_up_to_down_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config>
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" server_ip="10.0.2.55"
http_port="80">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
http_port="80"/>
</config>
</start>}
@ -304,12 +288,10 @@ append_if $tcp_up_to_down_2 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config>
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="192.168.2.72"
netmask="255.255.255.0" gateway="192.168.2.1"
http_port="8080">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
http_port="8080"/>
</config>
</start>
<start name="http_client_2">
@ -320,11 +302,9 @@ append_if $tcp_up_to_down_2 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config>
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" server_ip="10.0.2.55"
http_port="8080">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
http_port="8080"/>
</config>
</start>}
@ -338,11 +318,9 @@ append_if $tcp_down_to_up_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config>
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="10.0.2.11"
netmask="255.255.255.0" gateway="10.0.2.1" http_port="2345">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
netmask="255.255.255.0" gateway="10.0.2.1" http_port="2345"/>
</config>
</start>
<start name="http_client_3">
@ -353,12 +331,10 @@ append_if $tcp_down_to_up_1 config {
<any-service> <parent/> <any-child/> </any-service>
</route>
<config>
<vfs> <dir name="dev"> <log/> </dir> </vfs>
<libc stdout="/dev/log" stderr="/dev/log" ip_addr="100.200.0.128"
netmask="255.255.0.0" gateway="100.200.0.1"
server_ip="10.0.2.11" http_port="2345">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
server_ip="10.0.2.11" http_port="2345"/>
</config>
</start>}