NetworkManager r3675 - in trunk: . system-settings/plugins/ifcfg-fedora

[dcbw svn gnome org]

Author: dcbw
Date: Mon May 19 16:44:07 2008
New Revision: 3675
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3675&view=rev

Log:
2008-05-19  Dan Williams  <dcbw redhat com>

	* system-settings/plugins/ifcfg-fedora/reader.c
		- (make_ip4_setting): get a fallback gateway from /etc/sysconfig/network
			if the ifcfg doesn't specify one



Modified:
   trunk/ChangeLog
   trunk/system-settings/plugins/ifcfg-fedora/reader.c

Modified: trunk/system-settings/plugins/ifcfg-fedora/reader.c
==============================================================================
--- trunk/system-settings/plugins/ifcfg-fedora/reader.c	(original)
+++ trunk/system-settings/plugins/ifcfg-fedora/reader.c	Mon May 19 16:44:07 2008
@@ -182,6 +182,19 @@
 	if (*error)
 		goto error;
 
+	/* If no gateway in the ifcfg, try /etc/sysconfig/network instead */
+	if (!tmp.gateway) {
+		shvarFile *network;
+
+		network = svNewFile ("/etc/sysconfig/network");
+		if (network) {
+			get_one_ip4_addr (network, "GATEWAY", &tmp.gateway, error);
+			svCloseFile (network);
+			if (*error)
+				goto error;
+		}
+	}
+
 	get_one_ip4_addr (ifcfg, "NETMASK", &tmp.netmask, error);
 	if (*error)
 		goto error;