core: further logging to help debug (rh #594776)

4 files changed, 19 insertions, 3 deletions

diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 11994cade4..aebce94457 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -510,6 +510,9 @@ main (int argc, char *argv[])
 		goto done;
 	}
 
+	nm_info ("Networking %s by state file", net_enabled ? "enabled" : "disabled");
+	nm_info ("WiFi %s by state file", wifi_enabled ? "enabled" : "disabled");
+
 	manager = nm_manager_get (state_file, net_enabled, wifi_enabled);
 	if (manager == NULL) {
 		nm_error ("Failed to initialize the network manager.");
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 84c65917b9..b3959fc406 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -3649,6 +3649,14 @@ nm_device_wifi_set_enabled (NMDeviceWifi *self, gboolean enabled)
 	g_return_if_fail (NM_IS_DEVICE_WIFI (self));
 
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+
+	if (enable_debug) {
+		nm_debug ("(%s): request to %s device, currently %s",
+		          nm_device_get_iface (NM_DEVICE (self)),
+		          enabled ? "enable" : "disable",
+		          priv->enabled ? "enabled" : "disabled");
+	}
+
 	if (priv->enabled == enabled)
 		return;
 
diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c
index 0c0c5209d1..a903a898f4 100644
--- a/src/nm-hal-manager.c
+++ b/src/nm-hal-manager.c
@@ -57,6 +57,7 @@ typedef struct {
 	char *category;
 	gboolean (*is_device_fn) (NMHalManager *self, const char *udi);
 	NMDeviceCreatorFn creator_fn;
+	gboolean killswitches_polled;
 } DeviceCreator;
 
 static void emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator);
@@ -1393,7 +1394,7 @@ killswitch_getpower_done (gpointer user_data)
 	if (priv->pending_polls > 0)
 		return;
 
-	if (priv->poll_rfkilled != priv->rfkilled) {
+	if (priv->poll_rfkilled != priv->rfkilled || !priv->killswitches_polled) {
 		priv->rfkilled = priv->poll_rfkilled;
 		nm_info ("Radio killswitches now %s radios",
 		         priv->rfkilled ? "block" : "allow");
@@ -1406,6 +1407,8 @@ killswitch_getpower_done (gpointer user_data)
 	priv->killswitch_poll_id = g_timeout_add_seconds (RFKILL_POLL_FREQUENCY,
 	                                          poll_killswitches,
 	                                          self);
+
+	priv->killswitches_polled = TRUE;
 }
 
 static void 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 5dc507c4a5..99fd00cdef 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1848,6 +1848,8 @@ hal_manager_udi_added_cb (NMHalManager *hal_mgr,
 						  self);
 
 		/* Set initial rfkill state */
+		nm_info ("(%s): radio initially %s", iface,
+		         priv->wireless_enabled ? "enabled" : "disabled");
 		nm_device_wifi_set_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
 	}
 
@@ -1922,11 +1924,11 @@ hal_manager_rfkill_changed_cb (NMHalManager *hal_mgr,
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
 	gboolean enabled = !rfkilled;
 
+	nm_info ("Wireless now %s by radio killswitch", enabled ? "enabled" : "disabled");
+
 	if (priv->wireless_hw_enabled != enabled) {
-		nm_info ("Wireless now %s by radio killswitch", enabled ? "enabled" : "disabled");
 		priv->wireless_hw_enabled = enabled;
 		g_object_notify (G_OBJECT (self), NM_MANAGER_WIRELESS_HARDWARE_ENABLED);
-
 		manager_set_wireless_enabled (self, enabled);
 	}
 }