[Fai-commit] r5689 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-12-18 09:01:08 +0000 (Fri, 18 Dec 2009)
New Revision: 5689

Added:
   people/michael/experimental/patches/bugfix-561489
Modified:
   people/michael/experimental/patches/series
Log:
added bugfix for 561489


Added: people/michael/experimental/patches/bugfix-561489
===================================================================
--- people/michael/experimental/patches/bugfix-561489	                        (rev 0)
+++ people/michael/experimental/patches/bugfix-561489	2009-12-18 09:01:08 UTC (rev 5689)
@@ -0,0 +1,30 @@
+2009-12-18  Michael Tautschnig  <mt at debian.org>
+
+	* 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)
+
+Index: trunk/lib/disk-info
+===================================================================
+--- trunk.orig/lib/disk-info
++++ trunk/lib/disk-info	
+@@ -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
+ 
+ 
+Index: trunk/lib/setup-storage/Init.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Init.pm
++++ trunk/lib/setup-storage/Init.pm	
+@@ -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-t]|sd[a-t]{1,2}|hd[a-t]|vd[a-t]|xvd[a-t])(\d+)?$})
+   {
+     defined($2) or return (1, "/dev/$1", -1);
+     return (1, "/dev/$1", $2);

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-12-01 20:49:55 UTC (rev 5688)
+++ people/michael/experimental/patches/series	2009-12-18 09:01:08 UTC (rev 5689)
@@ -8,3 +8,4 @@
 bugfix-556082
 setup-storage_lvm-preserve2
 bugfix-558139
+bugfix-561489