new net configuration format

diff --git a/testing/hosts/alice/etc/conf.d/net b/testing/hosts/alice/etc/conf.d/net
index 089dc5f..02494db 100644 (file)
--- a/testing/hosts/alice/etc/conf.d/net
+++ b/testing/hosts/alice/etc/conf.d/net
@@ -2,10 +2,9 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_ALICE broadcast 10.1.255.255 netmask 255.255.0.0 add PH_IP6_ALICE/16"
+config_eth0=( "PH_IP_ALICE broadcast 10.1.255.255 netmask 255.255.0.0"
+              "PH_IP6_ALICE/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/PH_IP_MOON1"
-
+routes_eth0=( "default via PH_IP_MOON1" )

diff --git a/testing/hosts/bob/etc/conf.d/net b/testing/hosts/bob/etc/conf.d/net
index 977889f..bd0b3a5 100644 (file)
--- a/testing/hosts/bob/etc/conf.d/net
+++ b/testing/hosts/bob/etc/conf.d/net
@@ -2,9 +2,9 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_BOB broadcast 10.2.255.255 netmask 255.255.0.0 add PH_IP6_BOB/16"
+config_eth0=( "PH_IP_BOB broadcast 10.2.255.255 netmask 255.255.0.0"
+              "PH_IP6_BOB/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/PH_IP_SUN1"
+routes_eth0=( "default via PH_IP_SUN1" )

diff --git a/testing/hosts/carol/etc/conf.d/net b/testing/hosts/carol/etc/conf.d/net
index afd322c..f7f6859 100644 (file)
--- a/testing/hosts/carol/etc/conf.d/net
+++ b/testing/hosts/carol/etc/conf.d/net
@@ -2,9 +2,9 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_CAROL broadcast 192.168.0.255 netmask 255.255.255.0 add PH_IP6_CAROL/16"
+config_eth0=( "PH_IP_CAROL broadcast 192.168.0.255 netmask 255.255.255.0"
+              "PH_IP6_CAROL/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/192.168.0.254"
+routes_eth0=( "default via 192.168.0.254" )

diff --git a/testing/hosts/dave/etc/conf.d/net b/testing/hosts/dave/etc/conf.d/net
index f89dc5e..2b90252 100644 (file)
--- a/testing/hosts/dave/etc/conf.d/net
+++ b/testing/hosts/dave/etc/conf.d/net
@@ -2,9 +2,9 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_DAVE broadcast 192.168.0.255 netmask 255.255.255.0 add PH_IP6_DAVE/16"
+config_eth0=( "PH_IP_DAVE broadcast 192.168.0.255 netmask 255.255.255.0"
+              "PH_IP6_DAVE/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/192.168.0.254"
+routes_eth0=( "default via 192.168.0.254" )

diff --git a/testing/hosts/moon/etc/conf.d/net b/testing/hosts/moon/etc/conf.d/net
index 1e74a99..7f09fd8 100644 (file)
--- a/testing/hosts/moon/etc/conf.d/net
+++ b/testing/hosts/moon/etc/conf.d/net
@@ -2,10 +2,11 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_MOON broadcast 192.168.0.255 netmask 255.255.255.0 add PH_IP6_MOON/16"
-iface_eth1="PH_IP_MOON1 broadcast 10.1.255.255 netmask 255.255.0.0 add PH_IP6_MOON1/16"
+config_eth0=( "PH_IP_MOON broadcast 192.168.0.255 netmask 255.255.255.0"
+              "PH_IP6_MOON/16" )
+config_eth1=( "PH_IP_MOON1 broadcast 10.1.255.255 netmask 255.255.0.0"
+              "PH_IP6_MOON1/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/192.168.0.254"
+routes_eth0=( "default via 192.168.0.254" )

diff --git a/testing/hosts/sun/etc/conf.d/net b/testing/hosts/sun/etc/conf.d/net
index d3154db..4a6370a 100644 (file)
--- a/testing/hosts/sun/etc/conf.d/net
+++ b/testing/hosts/sun/etc/conf.d/net
@@ -2,12 +2,13 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_SUN broadcast 192.168.0.255 netmask 255.255.255.0 add PH_IP6_SUN/16"
-iface_eth1="PH_IP_SUN1 broadcast 10.2.255.255 netmask 255.255.0.0 add PH_IP6_SUN1/16"
+config_eth0=( "PH_IP_SUN broadcast 192.168.0.255 netmask 255.255.255.0"
+              "PH_IP6_SUN/16" )
+config_eth1=( "PH_IP_SUN1 broadcast 10.2.255.255 netmask 255.255.0.0"
+              "PH_IP6_SUN1/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/192.168.0.254"
+routes_eth0=( "default via 192.168.0.254" )
 
 

diff --git a/testing/hosts/venus/etc/conf.d/net b/testing/hosts/venus/etc/conf.d/net
index 9f93275..43ec978 100644 (file)
--- a/testing/hosts/venus/etc/conf.d/net
+++ b/testing/hosts/venus/etc/conf.d/net
@@ -2,10 +2,9 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_VENUS broadcast 10.1.255.255 netmask 255.255.0.0 add PH_IP6_VENUS/16"
+config_eth0=( "PH_IP_VENUS broadcast 10.1.255.255 netmask 255.255.0.0"
+              "PH_IP6_VENUS/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/PH_IP_MOON1"
-
+routes_eth0=( "default via PH_IP_MOON1" )

diff --git a/testing/hosts/winnetou/etc/conf.d/net b/testing/hosts/winnetou/etc/conf.d/net
index 6a1ad64..7fbc370 100644 (file)
--- a/testing/hosts/winnetou/etc/conf.d/net
+++ b/testing/hosts/winnetou/etc/conf.d/net
@@ -2,9 +2,9 @@
 
 # This is basically the ifconfig argument without the ifconfig $iface
 #
-iface_lo="127.0.0.1 netmask 255.0.0.0"
-iface_eth0="PH_IP_WINNETOU broadcast 192.168.0.255 netmask 255.255.255.0 add PH_IP6_WINNETOU/16"
+config_eth0=( "PH_IP_WINNETOU broadcast 192.168.0.255 netmask 255.255.255.0"
+              "PH_IP6_WINNETOU/16" )
 
 # For setting the default gateway
 #
-gateway="eth0/192.168.0.254"
+routes_eth0=( "default via 192.168.0.254" )