From 7f02656079d029ee3f887c1df07d6d8e9d4d6744 Mon Sep 17 00:00:00 2001 From: Ales Kozumplik Date: Tue, 1 Mar 2011 18:07:31 +0100 Subject: [booty rhel5-branch 1/3] Be a bit more clever recognizing partitions from names. (#572862) Similar rhel6 commit: ec9e957f3425e37cff34722cb6d10378bf454bee --- bootloaderInfo.py | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/bootloaderInfo.py b/bootloaderInfo.py index cdd1692..bca1321 100644 --- a/bootloaderInfo.py +++ b/bootloaderInfo.py @@ -2044,21 +2044,22 @@ class sparcBootloaderInfo(bootloaderInfo): # return (disk, partition number) eg ('hda', 1) def getDiskPart(dev): cut = len(dev) - if (dev.startswith('rd/') or dev.startswith('ida/') or + if dev[-1] in string.digits: + if (dev.startswith('rd/') or dev.startswith('ida/') or dev.startswith('cciss/') or dev.startswith('sx8/') or dev.startswith('mapper/')): - if dev[-2] == 'p': - cut = -1 - elif dev[-3] == 'p': - cut = -2 - else: - if dev[-2] in string.digits: - cut = -2 - elif dev[-1] in string.digits: - cut = -1 + if dev[-2] == 'p': + cut = -1 + elif dev[-3] == 'p' and dev[-2] in string.digits: + cut = -2 + else: + if dev[-2] in string.digits: + cut = -2 + else: + cut = -1 name = dev[:cut] - + # hack off the trailing 'p' from /dev/cciss/*, for example if name[-1] == 'p': for letter in name: -- 1.7.3.3