[Fai-commit] r5116 - in trunk/lib: . setup-storage

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-06 15:16:51 +0000 (Sat, 06 Sep 2008)
New Revision: 5116

Modified:
   trunk/lib/disk-info
   trunk/lib/setup-storage/Init.pm
Log:
add pattern to detect kvm devices like /dev/vd[abcd]X


Modified: trunk/lib/disk-info
===================================================================
--- trunk/lib/disk-info	2008-09-06 15:15:04 UTC (rev 5115)
+++ trunk/lib/disk-info	2008-09-06 15:16:51 UTC (rev 5116)
@@ -21,6 +21,6 @@
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # echo a space separated list of devices and their block size
-egrep ' i2o/hd.\b| cciss/c.d.\b| ida/c.d.\b| rd/c.d.\b| hd.\b| sd[a-z]{1,2}\b|/disc\b' /proc/partitions | diskandsize
+egrep ' i2o/hd.\b| cciss/c.d.\b| ida/c.d.\b| rd/c.d.\b| hd.\b| sd[a-z]{1,2}\b|/disc\b| vd.\b' /proc/partitions | diskandsize
 
 

Modified: trunk/lib/setup-storage/Init.pm
===================================================================
--- trunk/lib/setup-storage/Init.pm	2008-09-06 15:15:04 UTC (rev 5115)
+++ trunk/lib/setup-storage/Init.pm	2008-09-06 15:16:51 UTC (rev 5116)
@@ -163,7 +163,7 @@
 ################################################################################
 sub phys_dev {
   my ($dev) = @_;
-  if ($dev =~ m{^/dev/(i2o/hd[a-t]|sd[a-t]{1,2}|hd[a-t])(\d+)?$})
+  if ($dev =~ m{^/dev/(i2o/hd[a-t]|sd[a-t]{1,2}|hd[a-t]|vd[a-t])(\d+)?$})
   {
     defined($2) or return (1, "/dev/$1", -1);
     return (1, "/dev/$1", $2);