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

[Michael Tautschnig]

Author: mt
Date: 2009-12-31 14:17:35 +0000 (Thu, 31 Dec 2009)
New Revision: 5692

Removed:
   people/michael/experimental/patches/bugfix-561489
   people/michael/experimental/patches/setup-storage_more-dev-names
Modified:
   people/michael/experimental/patches/series
Log:
patches were merged into trunk


Deleted: people/michael/experimental/patches/bugfix-561489
===================================================================
--- people/michael/experimental/patches/bugfix-561489	2009-12-31 14:16:32 UTC (rev 5691)
+++ people/michael/experimental/patches/bugfix-561489	2009-12-31 14:17:35 UTC (rev 5692)
@@ -1,30 +0,0 @@
-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-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-31 14:16:32 UTC (rev 5691)
+++ people/michael/experimental/patches/series	2009-12-31 14:17:35 UTC (rev 5692)
@@ -1,4 +1,3 @@
-setup-storage_more-dev-names
 setup-storage_exp-version
 logtail
 grub-pc
@@ -9,4 +8,3 @@
 bugfix-556082
 setup-storage_lvm-preserve2
 bugfix-558139
-bugfix-561489

Deleted: people/michael/experimental/patches/setup-storage_more-dev-names
===================================================================
--- people/michael/experimental/patches/setup-storage_more-dev-names	2009-12-31 14:16:32 UTC (rev 5691)
+++ people/michael/experimental/patches/setup-storage_more-dev-names	2009-12-31 14:17:35 UTC (rev 5692)
@@ -1,17 +0,0 @@
-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);