|
 |
99c779 |
From b1eab6372d6ac9bda3c04f77db7ed54a566028d6 Mon Sep 17 00:00:00 2001
|
|
|
99c779 |
From: Lyonel Vincent <lyonel@ezix.org>
|
|
|
99c779 |
Date: Sat, 28 Jan 2017 01:29:14 +0100
|
|
|
99c779 |
Subject: [PATCH 43/43] fix #741 (Detect disk vendor SimpleTech)
|
|
|
99c779 |
|
|
|
99c779 |
---
|
|
|
99c779 |
src/core/heuristics.cc | 3 ++-
|
|
|
99c779 |
src/core/ideraid.cc | 3 ++-
|
|
|
99c779 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
99c779 |
|
|
|
99c779 |
diff --git a/src/core/heuristics.cc b/src/core/heuristics.cc
|
|
|
99c779 |
index 45b39a4..bd7bf6c 100644
|
|
|
99c779 |
--- a/src/core/heuristics.cc
|
|
|
99c779 |
+++ b/src/core/heuristics.cc
|
|
|
99c779 |
@@ -92,7 +92,8 @@ hwNode * guessParent(const hwNode & child, hwNode & base)
|
|
|
99c779 |
|
|
|
99c779 |
static const char *disk_manufacturers[] =
|
|
|
99c779 |
{
|
|
|
99c779 |
- "^ST.+", "Seagate",
|
|
|
99c779 |
+ "^ST(?!I\\ ).+", "Seagate",
|
|
|
99c779 |
+ "^STI\\ .+", "SimpleTech",
|
|
|
99c779 |
"^D...-.+", "IBM",
|
|
|
99c779 |
"^IBM.+", "IBM",
|
|
|
99c779 |
"^HITACHI.+", "Hitachi",
|
|
|
99c779 |
diff --git a/src/core/ideraid.cc b/src/core/ideraid.cc
|
|
|
99c779 |
index 080f4da..5cff28f 100644
|
|
|
99c779 |
--- a/src/core/ideraid.cc
|
|
|
99c779 |
+++ b/src/core/ideraid.cc
|
|
|
99c779 |
@@ -454,7 +454,8 @@ static bool probe_port(unsigned controller, unsigned disknum, hwNode & parent)
|
|
|
99c779 |
|
|
|
99c779 |
static const char *manufacturers[] =
|
|
|
99c779 |
{
|
|
|
99c779 |
- "^ST.+", "Seagate",
|
|
|
99c779 |
+ "^ST(?!I\\ ).+", "Seagate",
|
|
|
99c779 |
+ "^STI\\ .+", "SimpleTech",
|
|
|
99c779 |
"^D...-.+", "IBM",
|
|
|
99c779 |
"^IBM.+", "IBM",
|
|
|
99c779 |
"^HITACHI.+", "Hitachi",
|
|
|
99c779 |
--
|
|
|
99c779 |
2.10.2
|
|
|
99c779 |
|