Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/fix-977226-pt-summary-lsi-raid into lp:percona-toolkit/2.1

  1. fix-977226-pt-summary-lsi-raid
  2. Merge into 2.1
Proposed by Brian Fraser
Status: Merged
Approved by: Daniel Nichter
Approved revision: 330
Merged at revision: 340
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-977226-pt-summary-lsi-raid
Merge into: lp:percona-toolkit/2.1
Diff against target: 27 lines (+4/-2)
2 files modified
bin/pt-summary (+2/-1)
lib/bash/collect_system_info.sh (+2/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-977226-pt-summary-lsi-raid
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+117474@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-summary'
2--- bin/pt-summary 2012-07-21 17:57:53 +0000
3+++ bin/pt-summary 2012-07-31 16:04:46 +0000
4@@ -1139,7 +1139,8 @@
5
6 find_raid_controller_lspci () { local PTFUNCNAME=find_raid_controller_lspci;
7 local file="$1"
8- if grep -q "RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS" "${file}"; then
9+ if grep -q "RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS" "${file}" \
10+ || grep -q "RAID bus controller: LSI Logic / Symbios Logic LSI MegaSAS" $file; then
11 echo 'LSI Logic MegaRAID SAS'
12 elif grep -q "Fusion-MPT SAS" "${file}"; then
13 echo 'Fusion-MPT SAS'
14
15=== modified file 'lib/bash/collect_system_info.sh'
16--- lib/bash/collect_system_info.sh 2012-06-11 20:51:43 +0000
17+++ lib/bash/collect_system_info.sh 2012-07-31 16:04:46 +0000
18@@ -444,7 +444,8 @@
19 # ##############################################################################
20 find_raid_controller_lspci () { local PTFUNCNAME=find_raid_controller_lspci;
21 local file="$1"
22- if grep -q "RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS" "${file}"; then
23+ if grep -q "RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS" "${file}" \
24+ || grep -q "RAID bus controller: LSI Logic / Symbios Logic LSI MegaSAS" $file; then
25 echo 'LSI Logic MegaRAID SAS'
26 elif grep -q "Fusion-MPT SAS" "${file}"; then
27 echo 'Fusion-MPT SAS'

Subscribers

People subscribed via source and target branches