[Fai-commit] r5691 - in trunk: debian lib lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2009-12-31 14:16:32 +0000 (Thu, 31 Dec 2009)
New Revision: 5691

Modified:
   trunk/debian/changelog
   trunk/lib/disk-info
   trunk/lib/setup-storage/Init.pm
Log:
merged setup-storage_more-dev-names and bugfix-561489 into trunk


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-29 13:58:09 UTC (rev 5690)
+++ trunk/debian/changelog	2009-12-31 14:16:32 UTC (rev 5691)
@@ -10,6 +10,10 @@
     option (thanks Julien BLACHE for the patch).
   * fai-vol_id: Use blkid by default, use vol_id -L to obtain volume label
     when using vol_id (thanks Klaus Ethgen). (closes: #556168)
+  * setup-storage/Init.pm: Allow full a-z range in device names instead of a-t
+    limitiation (thanks Mattias Jansson for proving me wrong).
+  * disk-info, setup-storage/Init.pm: Also accept Xen's xvd[a-t] as valid disk
+    name (thanks Rudy Gevaert for the patch). (closes: #561489)
 
  -- Thomas Lange <lange at debian.org>  Tue, 01 Dec 2009 21:41:56 +0100
 

Modified: trunk/lib/disk-info
===================================================================
--- trunk/lib/disk-info	2009-12-29 13:58:09 UTC (rev 5690)
+++ trunk/lib/disk-info	2009-12-31 14:16:32 UTC (rev 5691)
@@ -21,6 +21,6 @@
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # echo a space separated list of devices and their block size
-egrep ' etherd/e[[:digit:]]+\.[[:digit:]]+\b| 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
+egrep ' etherd/e[[:digit:]]+\.[[:digit:]]+\b| 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| xvd.\b' /proc/partitions | diskandsize
 
 

Modified: trunk/lib/setup-storage/Init.pm
===================================================================
--- trunk/lib/setup-storage/Init.pm	2009-12-29 13:58:09 UTC (rev 5690)
+++ trunk/lib/setup-storage/Init.pm	2009-12-31 14:16:32 UTC (rev 5691)
@@ -176,7 +176,7 @@
 ################################################################################
 sub phys_dev {
   my ($dev) = @_;
-  if ($dev =~ m{^/dev/(i2o/hd[a-t]|sd[a-t]{1,2}|hd[a-t]|vd[a-t])(\d+)?$})
+  if ($dev =~ m{^/dev/(i2o/hd[a-z]|sd[a-z]{1,2}|hd[a-z]|vd[a-z]|xvd[a-z])(\d+)?$})
   {
     defined($2) or return (1, "/dev/$1", -1);
     return (1, "/dev/$1", $2);