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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3675 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-05-19 16:44:07 +00:00
parent 6c79f46f13
commit 5e184c707d
2 changed files with 19 additions and 0 deletions

View file

@ -1,3 +1,9 @@
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
2008-05-19 Dan Williams <dcbw@redhat.com>
Make the system settings service exit when the bus goes away. Since it's

View file

@ -182,6 +182,19 @@ make_ip4_setting (shvarFile *ifcfg, GError **error)
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;