From 29c343848a5e070b0c86403478d8327a16daa49f Mon Sep 17 00:00:00 2001 From: Curtis Gedak Date: Fri, 12 Sep 2008 20:57:12 +0000 Subject: [PATCH] Added pattern recognition for HP RAID drives svn path=/trunk/; revision=898 --- ChangeLog | 5 +++++ src/GParted_Core.cc | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 10cda37f..6599b679 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-12 Curtis Gedak + + * src/GParted_Core.cc: Added pattern recognition for HP RAID drives + - E.g., device = /dev/cciss/c0d0, partition = /dev/cciss/c0d0p1 + 2008-09-04 Curtis Gedak * include/Utils.h, diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc index afaa6083..90f7c236 100644 --- a/src/GParted_Core.cc +++ b/src/GParted_Core.cc @@ -136,6 +136,10 @@ void GParted_Core::set_devices( std::vector & devices ) { device_paths .clear() ; + //Fixme: Remove code to read /proc/partitions when libparted bug 194 is fixed. + // This was a problem with no floppy drive yet BIOS indicated one existed. + // http://parted.alioth.debian.org/cgi-bin/trac.cgi/ticket/194 + // //try to find all available devices std::ifstream proc_partitions( "/proc/partitions" ) ; if ( proc_partitions ) @@ -145,9 +149,13 @@ void GParted_Core::set_devices( std::vector & devices ) std::string device ; while ( getline( proc_partitions, line ) ) { + //Whole disk devices are the ones we want. //Device names without a trailing digit refer to the whole disk. - //These whole disk devices are the ones we want. device = Utils::regexp_label(line, "^[\t ]+[0-9]+[\t ]+[0-9]+[\t ]+[0-9]+[\t ]+([^0-9]+)$") ; + //Device names that end with a #[^p]# are HP Smart Array Devices (disks) + //E.g., device = /dev/cciss/c0d0, partition = /dev/cciss/c0d0p1 + if ( device == "" ) + device = Utils::regexp_label(line, "^[\t ]+[0-9]+[\t ]+[0-9]+[\t ]+[0-9]+[\t ]+(.*[0-9]+[^p]{1}[0-9]+)$") ; if ( device != "" ) { //try to have libparted detect the device and add it to the list