From 5e184c707defc0d1085b74a36c444aa7429c91aa Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 19 May 2008 16:44:07 +0000 Subject: [PATCH] 2008-05-19 Dan Williams * 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 --- ChangeLog | 6 ++++++ system-settings/plugins/ifcfg-fedora/reader.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6087d7c87d..637e29cbd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-19 Dan Williams + + * 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 Make the system settings service exit when the bus goes away. Since it's diff --git a/system-settings/plugins/ifcfg-fedora/reader.c b/system-settings/plugins/ifcfg-fedora/reader.c index 9bb47d3836..5e488d832f 100644 --- a/system-settings/plugins/ifcfg-fedora/reader.c +++ b/system-settings/plugins/ifcfg-fedora/reader.c @@ -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;