diff options
Diffstat (limited to 'debian')
4 files changed, 9 insertions, 42 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 4c640507..5f8fc953 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 9c5b666..fe39131 100644 +index 5c49eab..698162c 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3516,11 +3516,6 @@ endif +@@ -3515,11 +3515,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ @@ -22,9 +22,9 @@ index 9c5b666..fe39131 100644 - -service_DATA += data/org.freedesktop.NetworkManager.service - - install-exec-local-data: - install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants - ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants + endif + + examples_DATA += data/server.conf diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index a9e8731..e6cd392 100644 --- a/data/NetworkManager.service.in diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 27eb8915..18c4401e 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -75,10 +75,11 @@ index 7662c2e..413ec0b 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5062,6 +5094,62 @@ impl_manager_check_connectivity (NMManager *self, +@@ -5061,6 +5093,62 @@ impl_manager_check_connectivity (NMManager *self, + nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } - static void ++static void +check_ifstate_file (gpointer user_data) +{ + NMManager *self = NM_MANAGER (user_data); @@ -134,10 +135,9 @@ index 7662c2e..413ec0b 100644 + } +} + -+static void + static void start_factory (NMDeviceFactory *factory, gpointer user_data) { - nm_device_factory_start (factory); @@ -5203,6 +5291,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); diff --git a/debian/patches/series b/debian/patches/series index 01c14f38..af39d871 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch Fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch -systemd-Don-t-enable-NetworkManager-wait-online.serv.patch Fix-iscsiadm-path.patch diff --git a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch deleted file mode 100644 index e6427435..00000000 --- a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sun, 29 Mar 2015 22:58:43 +0200 -Subject: systemd: Don't enable NetworkManager-wait-online.service statically - -Instead we are going to hook up the service in network-online.target -dynamically via - -[Install] -WantedBy=network-online.target - -This way the user can easily disable the service. ---- - Makefile.am | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe39131..7e1e26f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3516,12 +3516,6 @@ endif - data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in - $(AM_V_GEN) $(data_edit) $< >$@ - --install-exec-local-data: -- install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants -- ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants -- --install_exec_local += install-exec-local-data -- - endif - - examples_DATA += data/server.conf |