Merge branch 'experimental'

5 files changed, 10 insertions, 37 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 b8a4c486..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 0b8becd..1803e1a 100644
+index 1e100f6..204f1a0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3895,11 +3895,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/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
index e2516d62..5ab7a01d 100644
--- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
@@ -16,7 +16,7 @@ Closes: #742933
  1 file changed, 5 insertions(+)
 
 diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index a7e3a7c..9931f12 100644
+index 54d7577..a4bb43f 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
deleted file mode 100644
index 7af98133..00000000
--- a/debian/patches/Fix-iscsiadm-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Wed, 6 May 2015 18:17:51 +0200
-Subject: Fix iscsiadm path
-
-The open-scsi package in Debian installs the iscisadm binary as
-/usr/bin/iscsiadm.
-
-This patch can be dropped post-stretch as open-iscsi now also ships the
-binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink).
----
- src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
-index 77ce208..f84276d 100644
---- a/src/settings/plugins/ibft/nms-ibft-plugin.c
-+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
-@@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self)
- 	GError *error = NULL;
- 	NMSIbftConnection *connection;
- 
--	if (!nms_ibft_reader_load_blocks ("/sbin/iscsiadm", &blocks, &error)) {
-+	if (!nms_ibft_reader_load_blocks ("/usr/bin/iscsiadm", &blocks, &error)) {
- 		nm_log_dbg (LOGD_SETTINGS, "ibft: failed to read iscsiadm records: %s", error->message);
- 		g_error_free (error);
- 		return;
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 022154c6..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 ad90616..d5f0f95 100644
+index 7598995..1439c47 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -35,7 +35,7 @@ index ad90616..d5f0f95 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1387,6 +1393,27 @@ find_best_device_state (NMManager *manager)
+@@ -1417,6 +1423,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ index ad90616..d5f0f95 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1425,6 +1452,9 @@ nm_manager_update_state (NMManager *self)
+@@ -1455,6 +1482,9 @@ nm_manager_update_state (NMManager *self)
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ index ad90616..d5f0f95 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5884,6 +5914,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 ad90616..d5f0f95 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6034,6 +6120,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 ad90616..d5f0f95 100644
  	return TRUE;
  }
  
-@@ -6897,6 +6986,22 @@ nm_manager_init (NMManager *self)
+@@ -7231,6 +7320,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index ad90616..d5f0f95 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7172,6 +7277,16 @@ dispose (GObject *object)
+@@ -7506,6 +7611,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/series b/debian/patches/series
index 0adf0cf1..6da89bb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
-Fix-iscsiadm-path.patch