From a3d320d7d0693c3d7cfd52b819e5d551a83419be Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 27 Apr 2016 13:22:21 -0700 Subject: [PATCH] Include upstream patch to whitelist devices with SCSI_IDENT property Issue #1236 --- ...-0.5.0-property-whitelist-SCSI_IDENT.patch | 29 +++++++++++++++++++ ...ebuild => multipath-tools-0.5.0-r2.ebuild} | 1 + 2 files changed, 30 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/files/multipath-tools-0.5.0-property-whitelist-SCSI_IDENT.patch rename sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/{multipath-tools-0.5.0-r1.ebuild => multipath-tools-0.5.0-r2.ebuild} (96%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/files/multipath-tools-0.5.0-property-whitelist-SCSI_IDENT.patch b/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/files/multipath-tools-0.5.0-property-whitelist-SCSI_IDENT.patch new file mode 100644 index 0000000000..8751f05280 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/files/multipath-tools-0.5.0-property-whitelist-SCSI_IDENT.patch @@ -0,0 +1,29 @@ +Origin: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commit;h=d041591e42b69e2ff99d9cc5c1111c83ccde3207 +From: Hannes Reinecke +Date: Thu, 10 Apr 2014 10:21:52 +0000 (+0200) +Subject: Use 'SCSI_IDENT_.*' as the default property whitelist +X-Git-Url: http://git.opensvc.com/gitweb.cgi?p=multipath-tools%2F.git;a=commitdiff_plain;h=d041591e42b69e2ff99d9cc5c1111c83ccde3207 + +Use 'SCSI_IDENT_.*' as the default property whitelist + +59-scsi-sg_utils.rules export the VPD pages as +SCSI_IDENT__. +So whenever we have a SCSI_IDENT_* property we know it +has come from VPD pages and we have a legit device. + +Signed-off-by: Hannes Reinecke +--- + +diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c +index cea128c..30c5031 100644 +--- a/libmultipath/blacklist.c ++++ b/libmultipath/blacklist.c +@@ -196,7 +196,7 @@ setup_default_blist (struct config * conf) + if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) + return 1; + +- str = STRDUP("(ID_SCSI_VPD|ID_WWN)"); ++ str = STRDUP("(SCSI_IDENT_.*|ID_WWN)"); + if (!str) + return 1; + if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r2.ebuild similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r2.ebuild index 43ecec12d6..065222dd45 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/multipath-tools/multipath-tools-0.5.0-r2.ebuild @@ -25,6 +25,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-makefile.patch epatch "${FILESDIR}"/${P}-systemd-pkgconfig.patch + epatch "${FILESDIR}"/${P}-property-whitelist-SCSI_IDENT.patch epatch_user }