--- NetworkManager/src/NetworkManagerPolicy.c.orig	2008-11-05 19:22:23 +0300
+++ NetworkManager/src/NetworkManagerPolicy.c	2008-11-10 13:34:28 +0300
@@ -394,6 +394,7 @@ done:
 	lookup_thread_free (thread);
 }
 
+
 static void
 update_system_hostname (NMPolicy *policy, NMDevice *best)
 {
@@ -602,7 +603,8 @@ update_routing_and_dns (NMPolicy *policy
 
 out:
 	/* Update the system hostname */
-	update_system_hostname (policy, best);
+	if(0)
+		update_system_hostname (policy, best);
 
 	policy->default_device = best;	
 }
@@ -713,7 +715,8 @@ global_state_changed (NMManager *manager
 static void
 hostname_changed (NMManager *manager, GParamSpec *pspec, gpointer user_data)
 {
-	update_system_hostname ((NMPolicy *) user_data, NULL);
+	if(0)
+		update_system_hostname ((NMPolicy *) user_data, NULL);
 }
 
 static void