diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch | 4 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch index 85d59320..9a7719d7 100644 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch @@ -10,10 +10,10 @@ to be autostarted by a client request. 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 79b0462..aa8971e 100644 +index 7eef51d..201ef1c 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3877,11 +3877,6 @@ endif +@@ -3884,11 +3884,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 743aa63c..2e31693f 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 9f0891a..6b299d2 100644 +index c6d82c9..ced37b6 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -73,7 +73,7 @@ index 9f0891a..6b299d2 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5875,6 +5905,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -5884,6 +5914,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 9f0891a..6b299d2 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6025,6 +6111,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6034,6 +6120,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 9f0891a..6b299d2 100644 return TRUE; } -@@ -6888,6 +6977,22 @@ nm_manager_init (NMManager *self) +@@ -6897,6 +6986,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 9f0891a..6b299d2 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7163,6 +7268,16 @@ dispose (GObject *object) +@@ -7172,6 +7277,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |