diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-21 02:41:27 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-21 02:49:02 +0200 |
| commit | 188e5504230be1fbccf9736eb7badcf8207f8f20 (patch) | |
| tree | 143bb00c8bc3538f4808eb6d1988317308ff9e52 /debian | |
| parent | f7d781f65b15d6fce7a1f9069f7032faaef8452a (diff) | |
Drop debian/patches/Fix-iscsiadm-path.patch
No longer needed.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/Fix-iscsiadm-path.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 27 deletions
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 <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 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; 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 |