about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/Force-online-state-with-unmanaged-devices.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 344f9152..1cbf104e 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 115 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index ae78b7c..81bbbe8 100644
+index 9211253..32a6412 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -52,6 +52,8 @@
@@ -73,7 +73,7 @@ index ae78b7c..81bbbe8 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6548,6 +6578,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -6547,6 +6577,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index ae78b7c..81bbbe8 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6731,6 +6817,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6730,6 +6816,9 @@ nm_manager_start (NMManager *self, GError **error)
  	nm_clear_g_source (&priv->devices_inited_id);
  	priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -146,7 +146,7 @@ index ae78b7c..81bbbe8 100644
  	return TRUE;
  }
  
-@@ -7585,6 +7674,22 @@ nm_manager_init (NMManager *self)
+@@ -7584,6 +7673,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index ae78b7c..81bbbe8 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7864,6 +7969,16 @@ dispose (GObject *object)
+@@ -7863,6 +7968,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}