From cf1e5264670f428f819b018951808990d25ac3b8 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 8 Jan 2015 08:02:09 -0500 Subject: fixup! ifcfg-rh: handle DEVTIMEOUT property (rh #1171917) --- src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 3 +++ src/settings/plugins/ifcfg-rh/reader.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 1e1381d300..8839fc7020 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -166,6 +166,9 @@ nm_ifcfg_connection_check_devtimeout (NMIfcfgConnection *self) /* ONBOOT=yes, DEVICE and DEVTIMEOUT are set, but device is not present */ nm_settings_connection_set_ready (NM_SETTINGS_CONNECTION (self), FALSE); + nm_log_info (LOGD_SETTINGS, "Waiting %u seconds for %s to appear for connection '%s'", + devtimeout, ifname, nm_connection_get_id (NM_CONNECTION (self))); + priv->devtimeout_link_changed_handler = g_signal_connect (nm_platform_get (), NM_PLATFORM_SIGNAL_LINK_CHANGED, G_CALLBACK (link_changed), self); diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 46f5136cd6..97ac58aab1 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -4857,7 +4857,7 @@ devtimeout_from_file (const char *filename) { shvarFile *ifcfg; char *devtimeout_str; - int devtimeout; + guint devtimeout; g_return_val_if_fail (filename != NULL, NULL); @@ -4867,7 +4867,7 @@ devtimeout_from_file (const char *filename) devtimeout_str = svGetValue (ifcfg, "DEVTIMEOUT", FALSE); if (devtimeout_str) { - devtimeout = atoi (devtimeout_str); + devtimeout = nm_utils_ascii_str_to_int64 (devtimeout_str, 10, 0, G_MAXUINT, 0); g_free (devtimeout_str); } else devtimeout = 0; -- cgit v1.2.1