summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-05-06 22:47:25 -0500
committerDan Williams <dcbw@redhat.com>2014-05-08 15:09:59 -0500
commit429023b24ec8123733947f20e13b792347a8dc61 (patch)
tree6ef92b86982162a18593d6fabcaaad18c3ba2e3a /src/main.c
parentdd3d5b22207e63ecbfd7f2222435fdc691f66f2e (diff)
downloadNetworkManager-429023b24ec8123733947f20e13b792347a8dc61.tar.gz
policy: remove old /etc/hosts cleaning code (bgo #729689)
NetworkManager stopped touching /etc/hosts in late 2010 before the NetworkManager 0.8.1 release. The code in nm-policy-hosts.c's only purpose is to remove any of the entries that NetworkManager added long ago. I think we're at the point where people have already upgraded to NetworkManager 0.8.1 or later and thus this code would be a NOP. The only risk is that some stale /etc/hosts entries will be left if you upgrade from NM 0.8 or lower to anything higher than that. FWIW, Ubuntu Lucid (10.04) ships NM 0.8.0 and SLES11 ships NM 0.7.0, so if users of these distros upgraded to a later NetworkManager they might run into the stale entries issue if we remove this code from NM. But given how old these distros are, it seems unlikely that users will do a direct upgrade to something 4+ years newer... https://bugzilla.gnome.org/show_bug.cgi?id=729689
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 15ac6a9e33..5f386cef28 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,7 +52,6 @@
#include "nm-hostname-provider.h"
#include "nm-vpn-manager.h"
#include "nm-logging.h"
-#include "nm-policy-hosts.h"
#include "nm-config.h"
#include "nm-posix-signals.h"
#include "nm-session-monitor.h"
@@ -651,9 +650,6 @@ main (int argc, char *argv[])
}
}
- /* Clean leftover "# Added by NetworkManager" entries from /etc/hosts */
- nm_policy_hosts_clean_etc_hosts ();
-
nm_manager_start (manager);
/* Make sure the loopback interface is up. If interface is down, we bring