From 16ecc345e03cdf8bc979e8a1778c4edfe7e18928 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 17:51:56 +0200 Subject: Refresh patches --- debian/patches/Fix-iscsiadm-path.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/patches/Fix-iscsiadm-path.patch') diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch index 7af98133..22ea2feb 100644 --- a/debian/patches/Fix-iscsiadm-path.patch +++ b/debian/patches/Fix-iscsiadm-path.patch @@ -12,10 +12,10 @@ binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink). 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 +index 69dd373..cf322d4 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) +@@ -70,7 +70,7 @@ read_connections (NMSIbftPlugin *self) GError *error = NULL; NMSIbftConnection *connection; -- cgit 1.3.0-6-gf8a5 From 188e5504230be1fbccf9736eb7badcf8207f8f20 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Oct 2018 02:41:27 +0200 Subject: Drop debian/patches/Fix-iscsiadm-path.patch No longer needed. --- debian/patches/Fix-iscsiadm-path.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 debian/patches/Fix-iscsiadm-path.patch (limited to 'debian/patches/Fix-iscsiadm-path.patch') diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch deleted file mode 100644 index 22ea2feb..00000000 --- a/debian/patches/Fix-iscsiadm-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Biebl -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 69dd373..cf322d4 100644 ---- a/src/settings/plugins/ibft/nms-ibft-plugin.c -+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c -@@ -70,7 +70,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; -- cgit 1.3.0-6-gf8a5