From 20031e184629b37ff565afbf806eb46f9d655680 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 8 Mar 2013 15:43:45 -0600 Subject: [PATCH] ifcfg-rh: save bridge STP disabled setting (bgo #694841) STP defaults to yes in NetworkManager (and the initscripts), so a missing STP value in an ifcfg file means yes/on. Calling svSetValue(STP, NULL) clears that line from the ifcfg, and thus STP gets interpreted as yes. Explicitly set stp to "no" so that the value actually gets saved. --- src/settings/plugins/ifcfg-rh/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index 3b2a59550..34f345702 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -1328,7 +1328,7 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, GError **error svSetValue (ifcfg, "DEVICE", iface, FALSE); svSetValue (ifcfg, "BRIDGING_OPTS", NULL, FALSE); - svSetValue (ifcfg, "STP", NULL, FALSE); + svSetValue (ifcfg, "STP", "no", FALSE); svSetValue (ifcfg, "DELAY", NULL, FALSE); /* Bridge options */