--- trunk/networkmanager/NetworkManagerMagellan.c 2010/02/13 11:25:26 980 +++ trunk/networkmanager/NetworkManagerMagellan.c 2010/09/27 20:15:14 1153 @@ -34,8 +34,9 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" +#include "nm-logging.h" /* * nm_system_enable_loopback @@ -45,7 +46,7 @@ */ void nm_system_enable_loopback (void) { - /* No need to run net.lo if it is already running */ + /* No need to run localnet if it is already running */ if (nm_spawn_process ("/etc/init.d/localnet status") != 0) nm_spawn_process("/etc/init.d/localnet start"); } @@ -59,10 +60,8 @@ */ void nm_system_update_dns (void) { - #ifdef NM_NO_NAMED - if (nm_spawn_process ("/etc/init.d/nscd status") == 0) - nm_spawn_process ("/etc/init.d/nscd restart"); - #else - nm_spawn_process("/usr/bin/killall -q nscd"); - #endif + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); + nm_spawn_process ("/usr/sbin/nscd -i hosts"); + } }