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

[Michael Tautschnig]

Author: mt
Date: 2009-12-29 13:58:09 +0000 (Tue, 29 Dec 2009)
New Revision: 5690

Added:
   people/michael/experimental/patches/setup-storage_more-dev-names
Modified:
   people/michael/experimental/patches/bugfix-561489
   people/michael/experimental/patches/series
Log:
added patch to support full a-z range in device names


Modified: people/michael/experimental/patches/bugfix-561489
===================================================================
--- people/michael/experimental/patches/bugfix-561489	2009-12-18 09:01:08 UTC (rev 5689)
+++ people/michael/experimental/patches/bugfix-561489	2009-12-29 13:58:09 UTC (rev 5690)
@@ -23,8 +23,8 @@
  ################################################################################
  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+)?$})
+-  if ($dev =~ m{^/dev/(i2o/hd[a-z]|sd[a-z]{1,2}|hd[a-z]|vd[a-z])(\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);

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-12-18 09:01:08 UTC (rev 5689)
+++ people/michael/experimental/patches/series	2009-12-29 13:58:09 UTC (rev 5690)
@@ -1,3 +1,4 @@
+setup-storage_more-dev-names
 setup-storage_exp-version
 logtail
 grub-pc

Added: people/michael/experimental/patches/setup-storage_more-dev-names
===================================================================
--- people/michael/experimental/patches/setup-storage_more-dev-names	                        (rev 0)
+++ people/michael/experimental/patches/setup-storage_more-dev-names	2009-12-29 13:58:09 UTC (rev 5690)
@@ -0,0 +1,17 @@
+2009-12-29  Michael Tautschnig  <mt at debian.org>
+
+	* setup-storage/Init.pm: Allow full a-z range in device names instead of a-t
+		limitiation (thanks Mattias Jansson for proving me wrong).
+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-z]|sd[a-z]{1,2}|hd[a-z]|vd[a-z])(\d+)?$})
+   {
+     defined($2) or return (1, "/dev/$1", -1);
+     return (1, "/dev/$1", $2);