diff --git a/network-bootopts-static-mac.ks.in b/network-bootopts-static-mac.ks.in index 5bf0a933..46f9f96c 100644 --- a/network-bootopts-static-mac.ks.in +++ b/network-bootopts-static-mac.ks.in @@ -42,9 +42,9 @@ fi check_device_config_value @KSTEST_NETDEV1@ IPADDR __NONE ipv4 method auto -check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV2@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ +check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV2@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@ check_device_config_value @KSTEST_NETDEV2@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;" check_device_ipv4_address @KSTEST_NETDEV2@ @KSTEST_STATIC_IP@ diff --git a/network-bootopts-static-unspec-bootif.ks.in b/network-bootopts-static-unspec-bootif.ks.in index a0ed8989..c73ca92a 100644 --- a/network-bootopts-static-unspec-bootif.ks.in +++ b/network-bootopts-static-unspec-bootif.ks.in @@ -42,9 +42,9 @@ fi check_device_config_value @KSTEST_NETDEV1@ IPADDR __NONE ipv4 method auto -check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV2@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ +check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV2@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@ check_device_config_value @KSTEST_NETDEV2@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;" check_device_ipv4_address @KSTEST_NETDEV2@ @KSTEST_STATIC_IP@ diff --git a/network-bootopts-static-unspec-single.ks.in b/network-bootopts-static-unspec-single.ks.in index fde7eb16..b9e75e49 100644 --- a/network-bootopts-static-unspec-single.ks.in +++ b/network-bootopts-static-unspec-single.ks.in @@ -31,9 +31,9 @@ check_gui_configurations @KSTEST_NETDEV1@ check_device_connected @KSTEST_NETDEV1@ yes -check_device_config_value @KSTEST_NETDEV1@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV1@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ +check_device_config_value @KSTEST_NETDEV1@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV1@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@ check_device_config_value @KSTEST_NETDEV1@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;" check_device_ipv4_address @KSTEST_NETDEV1@ @KSTEST_STATIC_IP@ diff --git a/network-bootopts-static.ks.in b/network-bootopts-static.ks.in index 97b7aef5..62d0e35c 100644 --- a/network-bootopts-static.ks.in +++ b/network-bootopts-static.ks.in @@ -29,9 +29,9 @@ check_gui_configurations @KSTEST_NETDEV1@ check_device_connected @KSTEST_NETDEV1@ yes -check_device_config_value @KSTEST_NETDEV1@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV1@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ -check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@ +check_device_config_value @KSTEST_NETDEV1@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV1@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@ +check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@ check_device_config_value @KSTEST_NETDEV1@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;" check_device_ipv4_address @KSTEST_NETDEV1@ @KSTEST_STATIC_IP@ diff --git a/network-static-httpks.ks.in b/network-static-httpks.ks.in index a5b922f1..72a4ba26 100644 --- a/network-static-httpks.ks.in +++ b/network-static-httpks.ks.in @@ -27,7 +27,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSINCLUDE@ post-lib-network.sh -check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24,@KSTEST_STATIC_GATEWAY@ +check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24 +check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@ check_device_config_value @KSTEST_NETDEV2@ ONBOOT no connection autoconnect false check_device_connected @KSTEST_NETDEV1@ yes check_device_connected @KSTEST_NETDEV2@ yes diff --git a/network-static.ks.in b/network-static.ks.in index a5b922f1..72a4ba26 100644 --- a/network-static.ks.in +++ b/network-static.ks.in @@ -27,7 +27,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSINCLUDE@ post-lib-network.sh -check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24,@KSTEST_STATIC_GATEWAY@ +check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24 +check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@ check_device_config_value @KSTEST_NETDEV2@ ONBOOT no connection autoconnect false check_device_connected @KSTEST_NETDEV1@ yes check_device_connected @KSTEST_NETDEV2@ yes