diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /debian/patches/Fix-iscsiadm-path.patch | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'debian/patches/Fix-iscsiadm-path.patch')
| -rw-r--r-- | debian/patches/Fix-iscsiadm-path.patch | 26 |
1 files changed, 0 insertions, 26 deletions
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; |