about summary refs log tree commit diff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/Fix-iscsiadm-path.patch23
-rw-r--r--debian/patches/series1
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
new file mode 100644
index 00000000..161b366f
--- /dev/null
+++ b/debian/patches/Fix-iscsiadm-path.patch
@@ -0,0 +1,23 @@
+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.
+---
+ src/settings/plugins/ibft/plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c
+index 632c4df..e64bbe4 100644
+--- a/src/settings/plugins/ibft/plugin.c
++++ b/src/settings/plugins/ibft/plugin.c
+@@ -62,7 +62,7 @@ read_connections (SCPluginIbft *self)
+ 	GError *error = NULL;
+ 	NMIbftConnection *connection;
+ 
+-	if (!read_ibft_blocks ("/sbin/iscsiadm", &blocks, &error)) {
++	if (!read_ibft_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/series b/debian/patches/series
index a6227112..1a072f1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Check-at-runtime-whether-to-start-ModemManager.patch
 build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 Don-t-block-network.target-on-NetworkManager-wait-on.patch
+Fix-iscsiadm-path.patch