|
 |
fc9aca |
From 3757404ab4d14fcd6e61b367c37308ef1e3dbc3a Mon Sep 17 00:00:00 2001
|
|
|
fc9aca |
From: Thomas Haller <thaller@redhat.com>
|
|
|
fc9aca |
Date: Thu, 25 May 2017 15:03:40 +0200
|
|
|
fc9aca |
Subject: [PATCH 1/5] ifcfg-rh: fix writing NETMASK in write_ip4_setting()
|
|
|
fc9aca |
|
|
|
fc9aca |
(cherry picked from commit efd462d946ae3382975cd73f60f33185a2cf9542)
|
|
|
fc9aca |
(cherry picked from commit 2bf3d590ceb99c9f7d0c5dfd3e031e69d14fa5b8)
|
|
|
fc9aca |
---
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 3 ++-
|
|
|
fc9aca |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
fc9aca |
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
|
|
fc9aca |
index 400e9bd..c66af01 100644
|
|
|
fc9aca |
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
|
|
fc9aca |
@@ -2196,7 +2196,8 @@ write_ip4_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
|
|
|
fc9aca |
char buf[INET_ADDRSTRLEN];
|
|
|
fc9aca |
|
|
|
fc9aca |
g_free (tmp);
|
|
|
fc9aca |
- svSetValueStr (ifcfg, netmask_key, nm_utils_inet4_ntop (prefix, buf));
|
|
|
fc9aca |
+ svSetValueStr (ifcfg, netmask_key,
|
|
|
fc9aca |
+ nm_utils_inet4_ntop (nm_utils_ip4_prefix_to_netmask (prefix), buf));
|
|
|
fc9aca |
}
|
|
|
fc9aca |
|
|
|
fc9aca |
svUnsetValue (ifcfg, gw_key);
|
|
|
fc9aca |
--
|
|
|
fc9aca |
2.9.4
|
|
|
fc9aca |
|
|
|
fc9aca |
|
|
|
fc9aca |
From 37b96ee417fb9bb67a02c162f1dbe05fa4a9eb5f Mon Sep 17 00:00:00 2001
|
|
|
fc9aca |
From: Thomas Haller <thaller@redhat.com>
|
|
|
fc9aca |
Date: Thu, 25 May 2017 14:53:03 +0200
|
|
|
fc9aca |
Subject: [PATCH 2/5] ifcfg-rh: add svFindFirstKeyWithPrefix() function
|
|
|
fc9aca |
|
|
|
fc9aca |
During backporting manually patched to use GList instead of CList.
|
|
|
fc9aca |
|
|
|
fc9aca |
(cherry picked from commit e9d960740af008acb91074b31a570fba17dc0344)
|
|
|
fc9aca |
(cherry picked from commit 3dfddc18a53601463da49451c05cc62869773e16)
|
|
|
fc9aca |
---
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/shvar.c | 22 ++++++++++++++++++++++
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/shvar.h | 2 ++
|
|
|
fc9aca |
2 files changed, 24 insertions(+)
|
|
|
fc9aca |
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
|
|
|
fc9aca |
index 9fce5aa..47ad5a2 100644
|
|
|
fc9aca |
--- a/src/settings/plugins/ifcfg-rh/shvar.c
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
|
|
|
fc9aca |
@@ -905,6 +905,28 @@ svGetKeys (shvarFile *s)
|
|
|
fc9aca |
|
|
|
fc9aca |
/*****************************************************************************/
|
|
|
fc9aca |
|
|
|
fc9aca |
+const char *
|
|
|
fc9aca |
+svFindFirstKeyWithPrefix (shvarFile *s, const char *key_prefix)
|
|
|
fc9aca |
+{
|
|
|
fc9aca |
+ const GList *current;
|
|
|
fc9aca |
+ const shvarLine *l;
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ g_return_val_if_fail (s, NULL);
|
|
|
fc9aca |
+ g_return_val_if_fail (key_prefix, NULL);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ for (current = s->lineList; current; current = current->next) {
|
|
|
fc9aca |
+ l = current->data;
|
|
|
fc9aca |
+ if ( l->key
|
|
|
fc9aca |
+ && l->line
|
|
|
fc9aca |
+ && g_str_has_prefix (l->key, key_prefix))
|
|
|
fc9aca |
+ return l->key;
|
|
|
fc9aca |
+ }
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ return NULL;
|
|
|
fc9aca |
+}
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+/*****************************************************************************/
|
|
|
fc9aca |
+
|
|
|
fc9aca |
static const char *
|
|
|
fc9aca |
_svGetValue (shvarFile *s, const char *key, char **to_free)
|
|
|
fc9aca |
{
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h
|
|
|
fc9aca |
index 9d8c236..a13920a 100644
|
|
|
fc9aca |
--- a/src/settings/plugins/ifcfg-rh/shvar.h
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/shvar.h
|
|
|
fc9aca |
@@ -44,6 +44,8 @@ shvarFile *svCreateFile (const char *name);
|
|
|
fc9aca |
/* Open the file <name>, return shvarFile on success, NULL on failure */
|
|
|
fc9aca |
shvarFile *svOpenFile (const char *name, GError **error);
|
|
|
fc9aca |
|
|
|
fc9aca |
+const char *svFindFirstKeyWithPrefix (shvarFile *s, const char *key_prefix);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
/* Get the value associated with the key, and leave the current pointer
|
|
|
fc9aca |
* pointing at the line containing the value. The char* returned MUST
|
|
|
fc9aca |
* be freed by the caller.
|
|
|
fc9aca |
--
|
|
|
fc9aca |
2.9.4
|
|
|
fc9aca |
|
|
|
fc9aca |
|
|
|
fc9aca |
From 9df20fdb815fd37f31fa488325bfc3803bfa5003 Mon Sep 17 00:00:00 2001
|
|
|
fc9aca |
From: Thomas Haller <thaller@redhat.com>
|
|
|
fc9aca |
Date: Thu, 25 May 2017 14:07:28 +0200
|
|
|
fc9aca |
Subject: [PATCH 3/5] build: sort filenames in Makefile.am alphabetically
|
|
|
fc9aca |
|
|
|
fc9aca |
(cherry picked from commit 371b761680d660ea61ae33e02916564a0c3acc02)
|
|
|
fc9aca |
(cherry picked from commit 85aa450e947785dc2eab73a5b248345ce9662b5b)
|
|
|
fc9aca |
---
|
|
|
fc9aca |
Makefile.am | 301 ++++++++++++++++++++++++++++++------------------------------
|
|
|
fc9aca |
1 file changed, 151 insertions(+), 150 deletions(-)
|
|
|
fc9aca |
|
|
|
fc9aca |
diff --git a/Makefile.am b/Makefile.am
|
|
|
fc9aca |
index 909847e..c543a21 100644
|
|
|
fc9aca |
--- a/Makefile.am
|
|
|
fc9aca |
+++ b/Makefile.am
|
|
|
fc9aca |
@@ -2003,154 +2003,153 @@ $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h
|
|
|
fc9aca |
endif
|
|
|
fc9aca |
|
|
|
fc9aca |
EXTRA_DIST += \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \
|
|
|
fc9aca |
@@ -2159,32 +2158,34 @@ EXTRA_DIST += \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
|
|
|
fc9aca |
- src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
|
|
|
fc9aca |
+ $(NULL)
|
|
|
fc9aca |
|
|
|
fc9aca |
# make target dependencies can't have colons in their names, which ends up
|
|
|
fc9aca |
# meaning that we can't add the alias files to EXTRA_DIST. They are instead
|
|
|
fc9aca |
--
|
|
|
fc9aca |
2.9.4
|
|
|
fc9aca |
|
|
|
fc9aca |
|
|
|
fc9aca |
From 20046c93062b14b0329cf151bc5e8a7f3c455531 Mon Sep 17 00:00:00 2001
|
|
|
fc9aca |
From: Thomas Haller <thaller@redhat.com>
|
|
|
fc9aca |
Date: Thu, 25 May 2017 14:03:42 +0200
|
|
|
fc9aca |
Subject: [PATCH 4/5] ifcfg-rh/tests: add test for reading NETMASK property
|
|
|
fc9aca |
|
|
|
fc9aca |
(cherry picked from commit ba05819c89d913ad1bc6b86e62c7704d173ef534)
|
|
|
fc9aca |
(cherry picked from commit 7ebc132864776a1c0ce4a33660408a2953e076c8)
|
|
|
fc9aca |
---
|
|
|
fc9aca |
Makefile.am | 1 +
|
|
|
fc9aca |
shared/nm-utils/nm-test-utils.h | 9 +++++
|
|
|
fc9aca |
.../ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 | 14 +++++++
|
|
|
fc9aca |
.../network-scripts/ifcfg-netmask-1.cexpected | 22 +++++++++++
|
|
|
fc9aca |
.../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 44 ++++++++++++++++++++++
|
|
|
fc9aca |
5 files changed, 90 insertions(+)
|
|
|
fc9aca |
create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
|
|
|
fc9aca |
create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
|
|
|
fc9aca |
|
|
|
fc9aca |
diff --git a/Makefile.am b/Makefile.am
|
|
|
fc9aca |
index c543a21..50ef197 100644
|
|
|
fc9aca |
--- a/Makefile.am
|
|
|
fc9aca |
+++ b/Makefile.am
|
|
|
fc9aca |
@@ -2025,6 +2025,7 @@ EXTRA_DIST += \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
|
|
|
fc9aca |
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
|
|
|
fc9aca |
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
|
|
|
fc9aca |
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
|
|
|
fc9aca |
index 0dfdfce..bc52113 100644
|
|
|
fc9aca |
--- a/shared/nm-utils/nm-test-utils.h
|
|
|
fc9aca |
+++ b/shared/nm-utils/nm-test-utils.h
|
|
|
fc9aca |
@@ -1183,6 +1183,15 @@ nmtst_file_get_contents (const char *filename)
|
|
|
fc9aca |
return contents;
|
|
|
fc9aca |
}
|
|
|
fc9aca |
|
|
|
fc9aca |
+#define nmtst_file_set_contents(filename, content) \
|
|
|
fc9aca |
+ G_STMT_START { \
|
|
|
fc9aca |
+ GError *_error = NULL; \
|
|
|
fc9aca |
+ gboolean _success; \
|
|
|
fc9aca |
+ \
|
|
|
fc9aca |
+ _success = g_file_set_contents ((filename), (content), -1, &_error); \
|
|
|
fc9aca |
+ nmtst_assert_success (_success, _error); \
|
|
|
fc9aca |
+ } G_STMT_END
|
|
|
fc9aca |
+
|
|
|
fc9aca |
/*****************************************************************************/
|
|
|
fc9aca |
|
|
|
fc9aca |
static inline void
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
|
|
|
fc9aca |
new file mode 100644
|
|
|
fc9aca |
index 0000000..ecb36c3
|
|
|
fc9aca |
--- /dev/null
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
|
|
|
fc9aca |
@@ -0,0 +1,14 @@
|
|
|
fc9aca |
+DNS1="192.0.2.1"
|
|
|
fc9aca |
+IPADDR="102.0.2.2"
|
|
|
fc9aca |
+GATEWAY="192.0.2.1"
|
|
|
fc9aca |
+NETMASK="255.254.0.0"
|
|
|
fc9aca |
+BOOTPROTO="static"
|
|
|
fc9aca |
+DEVICE="eth1"
|
|
|
fc9aca |
+ONBOOT="yes"
|
|
|
fc9aca |
+IPV6INIT="yes"
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+#bogus
|
|
|
fc9aca |
+PREFIX1=25
|
|
|
fc9aca |
+NETMASK0=255.255.0.0
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+#end
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
|
|
|
fc9aca |
new file mode 100644
|
|
|
fc9aca |
index 0000000..4c2294a
|
|
|
fc9aca |
--- /dev/null
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
|
|
|
fc9aca |
@@ -0,0 +1,22 @@
|
|
|
fc9aca |
+DNS1=192.0.2.1
|
|
|
fc9aca |
+IPADDR=102.0.2.2
|
|
|
fc9aca |
+GATEWAY=192.0.2.1
|
|
|
fc9aca |
+BOOTPROTO="static"
|
|
|
fc9aca |
+DEVICE=eth1
|
|
|
fc9aca |
+ONBOOT=yes
|
|
|
fc9aca |
+IPV6INIT=yes
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+#bogus
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+#end
|
|
|
fc9aca |
+TYPE=Ethernet
|
|
|
fc9aca |
+PROXY_METHOD=none
|
|
|
fc9aca |
+BROWSER_ONLY=no
|
|
|
fc9aca |
+PREFIX=15
|
|
|
fc9aca |
+DEFROUTE=yes
|
|
|
fc9aca |
+IPV4_FAILURE_FATAL=no
|
|
|
fc9aca |
+IPV6_AUTOCONF=yes
|
|
|
fc9aca |
+IPV6_DEFROUTE=yes
|
|
|
fc9aca |
+IPV6_FAILURE_FATAL=no
|
|
|
fc9aca |
+NAME="System netmask-1"
|
|
|
fc9aca |
+UUID=${UUID}
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
|
|
fc9aca |
index babb068..e30d2d7 100644
|
|
|
fc9aca |
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
|
|
fc9aca |
@@ -399,6 +399,48 @@ _writer_new_connection_fail (NMConnection *connection,
|
|
|
fc9aca |
|
|
|
fc9aca |
/*****************************************************************************/
|
|
|
fc9aca |
|
|
|
fc9aca |
+static void
|
|
|
fc9aca |
+test_read_netmask_1 (void)
|
|
|
fc9aca |
+{
|
|
|
fc9aca |
+ nmtst_auto_unlinkfile char *testfile = NULL;
|
|
|
fc9aca |
+ gs_unref_object NMConnection *connection = NULL;
|
|
|
fc9aca |
+ gs_unref_object NMConnection *reread = NULL;
|
|
|
fc9aca |
+ gs_free char *content = NULL;
|
|
|
fc9aca |
+ NMSettingConnection *s_con;
|
|
|
fc9aca |
+ NMSettingIPConfig *s_ip4;
|
|
|
fc9aca |
+ NMIPAddress *ip4_addr;
|
|
|
fc9aca |
+ const char *FILENAME = TEST_IFCFG_DIR "/network-scripts/ifcfg-netmask-1";
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ connection = _connection_from_file (FILENAME, NULL, TYPE_ETHERNET, NULL);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ s_con = nm_connection_get_setting_connection (connection);
|
|
|
fc9aca |
+ g_assert (s_con);
|
|
|
fc9aca |
+ g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "System netmask-1");
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ s_ip4 = nm_connection_get_setting_ip4_config (connection);
|
|
|
fc9aca |
+ g_assert (s_ip4);
|
|
|
fc9aca |
+ g_assert_cmpuint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 1);
|
|
|
fc9aca |
+ ip4_addr = nm_setting_ip_config_get_address (s_ip4, 0);
|
|
|
fc9aca |
+ g_assert (ip4_addr);
|
|
|
fc9aca |
+ g_assert_cmpstr (nm_ip_address_get_address (ip4_addr), ==, "102.0.2.2");
|
|
|
fc9aca |
+ g_assert_cmpint (nm_ip_address_get_prefix (ip4_addr), ==, 15);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ nmtst_assert_connection_verifies_without_normalization (connection);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ content = nmtst_file_get_contents (FILENAME);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ testfile = g_strdup (TEST_SCRATCH_DIR "/network-scripts/ifcfg-netmask-1.copy");
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ nmtst_file_set_contents (testfile, content);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+ _writer_update_connection (connection,
|
|
|
fc9aca |
+ TEST_SCRATCH_DIR "/network-scripts/",
|
|
|
fc9aca |
+ testfile,
|
|
|
fc9aca |
+ TEST_IFCFG_DIR "/network-scripts/ifcfg-netmask-1.cexpected");
|
|
|
fc9aca |
+}
|
|
|
fc9aca |
+
|
|
|
fc9aca |
+/*****************************************************************************/
|
|
|
fc9aca |
+
|
|
|
fc9aca |
static gboolean
|
|
|
fc9aca |
verify_cert_or_key (NMSetting8021x *s_compare,
|
|
|
fc9aca |
const char *file,
|
|
|
fc9aca |
@@ -9348,6 +9390,8 @@ int main (int argc, char **argv)
|
|
|
fc9aca |
nmtst_add_test_func (TPATH "read-static", test_read_wired_static, TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static", "System test-wired-static", GINT_TO_POINTER (TRUE));
|
|
|
fc9aca |
nmtst_add_test_func (TPATH "read-static-bootproto", test_read_wired_static, TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static-bootproto", "System test-wired-static-bootproto", GINT_TO_POINTER (FALSE));
|
|
|
fc9aca |
|
|
|
fc9aca |
+ g_test_add_func (TPATH "read-netmask-1", test_read_netmask_1);
|
|
|
fc9aca |
+
|
|
|
fc9aca |
g_test_add_func (TPATH "read-dhcp", test_read_wired_dhcp);
|
|
|
fc9aca |
g_test_add_func (TPATH "read-dhcp-plus-ip", test_read_wired_dhcp_plus_ip);
|
|
|
fc9aca |
g_test_add_func (TPATH "read-shared-plus-ip", test_read_wired_shared_plus_ip);
|
|
|
fc9aca |
--
|
|
|
fc9aca |
2.9.4
|
|
|
fc9aca |
|
|
|
fc9aca |
|
|
|
fc9aca |
From 78895ad4d2fcc5fd3b2f845521ac14b9f6030fd6 Mon Sep 17 00:00:00 2001
|
|
|
fc9aca |
From: Thomas Haller <thaller@redhat.com>
|
|
|
fc9aca |
Date: Thu, 25 May 2017 15:00:27 +0200
|
|
|
fc9aca |
Subject: [PATCH 5/5] ifcfg-rh: fix preserving NETMASK key in
|
|
|
fc9aca |
write_ip4_setting()
|
|
|
fc9aca |
|
|
|
fc9aca |
To support legacy scripts, we want to write out the NETMASK
|
|
|
fc9aca |
key whenever the ifcfg file has a NETMASK key previously.
|
|
|
fc9aca |
Note, that we anyway always write the relevant PREFIX key.
|
|
|
fc9aca |
The NETMASK is redundant, only there to help legacy scripts.
|
|
|
fc9aca |
|
|
|
fc9aca |
That was broken, because we would svUnsetValue("NETMASK") before
|
|
|
fc9aca |
checking whether the NETMASK key is present.
|
|
|
fc9aca |
|
|
|
fc9aca |
Also, when saving a connection to ifcfg-rh file that was created
|
|
|
fc9aca |
by other tools, we might mix up the numbering. E.g. we never
|
|
|
fc9aca |
write out IPADDR0. Hence, turn on legacy mode whenever the ifcfg-rh
|
|
|
fc9aca |
file has any key starting with "NETMASK".
|
|
|
fc9aca |
|
|
|
fc9aca |
(cherry picked from commit 844bf3d1a239f409d12ea437dbe866b66f5f1af4)
|
|
|
fc9aca |
(cherry picked from commit 92a277dc6f08d66cf567b9bf6f1c32c513c7325e)
|
|
|
fc9aca |
---
|
|
|
fc9aca |
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 32 ++++++++++++----------
|
|
|
fc9aca |
.../network-scripts/ifcfg-netmask-1.cexpected | 1 +
|
|
|
fc9aca |
2 files changed, 18 insertions(+), 15 deletions(-)
|
|
|
fc9aca |
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
|
|
fc9aca |
index c66af01..d2b7ff6 100644
|
|
|
fc9aca |
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
|
|
fc9aca |
@@ -2067,6 +2067,7 @@ write_ip4_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
|
|
|
fc9aca |
int timeout;
|
|
|
fc9aca |
GString *searches;
|
|
|
fc9aca |
const char *method = NULL;
|
|
|
fc9aca |
+ gboolean has_netmask;
|
|
|
fc9aca |
|
|
|
fc9aca |
s_ip4 = nm_connection_get_setting_ip4_config (connection);
|
|
|
fc9aca |
if (!s_ip4) {
|
|
|
fc9aca |
@@ -2139,16 +2140,7 @@ write_ip4_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
|
|
|
fc9aca |
else if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
|
|
|
fc9aca |
svSetValueStr (ifcfg, "BOOTPROTO", "shared");
|
|
|
fc9aca |
|
|
|
fc9aca |
- /* Clear out un-numbered IP address fields */
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "IPADDR");
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "PREFIX");
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "NETMASK");
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "GATEWAY");
|
|
|
fc9aca |
- /* Clear out zero-indexed IP address fields */
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "IPADDR0");
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "PREFIX0");
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "NETMASK0");
|
|
|
fc9aca |
- svUnsetValue (ifcfg, "GATEWAY0");
|
|
|
fc9aca |
+ has_netmask = !!svFindFirstKeyWithPrefix (ifcfg, "NETMASK");
|
|
|
fc9aca |
|
|
|
fc9aca |
/* Write out IPADDR<n>, PREFIX<n>, GATEWAY<n> for current IP addresses
|
|
|
fc9aca |
* without labels. Unset obsolete NETMASK<n>.
|
|
|
fc9aca |
@@ -2192,20 +2184,30 @@ write_ip4_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
|
|
|
fc9aca |
g_free (tmp);
|
|
|
fc9aca |
|
|
|
fc9aca |
/* If the legacy "NETMASK" is present, keep it. */
|
|
|
fc9aca |
- if (svGetValue (ifcfg, netmask_key, &tmp)) {
|
|
|
fc9aca |
+ if (has_netmask) {
|
|
|
fc9aca |
char buf[INET_ADDRSTRLEN];
|
|
|
fc9aca |
|
|
|
fc9aca |
- g_free (tmp);
|
|
|
fc9aca |
svSetValueStr (ifcfg, netmask_key,
|
|
|
fc9aca |
nm_utils_inet4_ntop (nm_utils_ip4_prefix_to_netmask (prefix), buf));
|
|
|
fc9aca |
- }
|
|
|
fc9aca |
+ } else
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, netmask_key);
|
|
|
fc9aca |
|
|
|
fc9aca |
svUnsetValue (ifcfg, gw_key);
|
|
|
fc9aca |
n++;
|
|
|
fc9aca |
}
|
|
|
fc9aca |
|
|
|
fc9aca |
- /* Clear remaining IPADDR<n..255>, etc */
|
|
|
fc9aca |
- for (i = n; i < 256; i++) {
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "IPADDR0");
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "PREFIX0");
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "NETMASK0");
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "GATEWAY0");
|
|
|
fc9aca |
+ if (n == 0) {
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "IPADDR");
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "PREFIX");
|
|
|
fc9aca |
+ svUnsetValue (ifcfg, "NETMASK");
|
|
|
fc9aca |
+ i = 1;
|
|
|
fc9aca |
+ } else
|
|
|
fc9aca |
+ i = n;
|
|
|
fc9aca |
+ for (; i < 256; i++) {
|
|
|
fc9aca |
nm_sprintf_buf (addr_key, "IPADDR%u", i);
|
|
|
fc9aca |
nm_sprintf_buf (prefix_key, "PREFIX%u", i);
|
|
|
fc9aca |
nm_sprintf_buf (netmask_key, "NETMASK%u", i);
|
|
|
fc9aca |
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
|
|
|
fc9aca |
index 4c2294a..5dfdce4 100644
|
|
|
fc9aca |
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
|
|
|
fc9aca |
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
|
|
|
fc9aca |
@@ -1,6 +1,7 @@
|
|
|
fc9aca |
DNS1=192.0.2.1
|
|
|
fc9aca |
IPADDR=102.0.2.2
|
|
|
fc9aca |
GATEWAY=192.0.2.1
|
|
|
fc9aca |
+NETMASK=255.254.0.0
|
|
|
fc9aca |
BOOTPROTO="static"
|
|
|
fc9aca |
DEVICE=eth1
|
|
|
fc9aca |
ONBOOT=yes
|
|
|
fc9aca |
--
|
|
|
fc9aca |
2.9.4
|
|
|
fc9aca |
|