diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-20 01:32:51 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-20 01:32:51 +0200 |
| commit | 9b7e64484916662953240ee98a0a4e4cc00e4fa2 (patch) | |
| tree | 0976473f1d1f971da65325b740a0eca2d263825a /debian | |
| parent | 14055d61807dd217be44ee55ce4379dbeac34d9c (diff) | |
Rebase patches
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 f39bb9a6..636865a4 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 5b0feef..a684821 100644 +index 1e100f6..204f1a0 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3845,11 +3845,6 @@ endif +@@ -4110,11 +4110,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 ee3a30ac..ae96f968 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 f8be6d3..9554a92 100644 +index 7598995..1439c47 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -73,7 +73,7 @@ index f8be6d3..9554a92 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6082,6 +6112,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6209,6 +6239,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index f8be6d3..9554a92 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6242,6 +6328,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6377,6 +6463,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 f8be6d3..9554a92 100644 return TRUE; } -@@ -7096,6 +7185,22 @@ nm_manager_init (NMManager *self) +@@ -7231,6 +7320,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index f8be6d3..9554a92 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7371,6 +7476,16 @@ dispose (GObject *object) +@@ -7506,6 +7611,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |