colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: don't log warnings when devices are removed

Browse Source 
If a device is removed, then trying to reset its IPv6 state will cause
nm_utils_do_sysctl() to log a warning since the path no longer exists.
So don't try to do it in that case.
This commit is contained in:
Dan Winship
2013-08-06 11:03:28 -04:00
parent 320a9d16a3
commit 04bd4a9ea5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/nm-device.c
View File

@@ -4861,14 +4861,16 @@ dispose (GObject *object)
g_clear_object (&priv->vpn6_config); g_clear_object (&priv->vpn6_config);
/* reset the saved RA value */ /* reset the saved RA value */
if (priv->ip6_accept_ra_path) { if ( priv->ip6_accept_ra_path
&& g_file_test (priv->ip6_accept_ra_path, G_FILE_TEST_EXISTS)) {
nm_utils_do_sysctl (priv->ip6_accept_ra_path, nm_utils_do_sysctl (priv->ip6_accept_ra_path,
priv->ip6_accept_ra_save ? "1" : "0"); priv->ip6_accept_ra_save ? "1" : "0");
} }
g_free (priv->ip6_accept_ra_path); g_free (priv->ip6_accept_ra_path);
/* reset the saved use_tempaddr value */ /* reset the saved use_tempaddr value */
if (priv->ip6_privacy_tempaddr_path) { if ( priv->ip6_privacy_tempaddr_path
&& g_file_test (priv->ip6_privacy_tempaddr_path, G_FILE_TEST_EXISTS)) {
char tmp[16]; char tmp[16];
snprintf (tmp, sizeof (tmp), "%d", priv->ip6_privacy_tempaddr_save); snprintf (tmp, sizeof (tmp), "%d", priv->ip6_privacy_tempaddr_save);