[Fai-commit] r5720 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-02-03 10:06:01 +0000 (Wed, 03 Feb 2010)
New Revision: 5720

Modified:
   trunk/bin/device2grub
   trunk/debian/changelog
Log:
device2grub: add support for devices named vdX (closes: #568203)

Modified: trunk/bin/device2grub
===================================================================
--- trunk/bin/device2grub	2010-02-02 16:41:17 UTC (rev 5719)
+++ trunk/bin/device2grub	2010-02-03 10:06:01 UTC (rev 5720)
@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# copyright Thomas Lange 2001-2007, lange at debian.org
+# copyright Thomas Lange 2001-2010, lange at debian.org
 # map "normal" device notation to grub notation
 
 # TODO: read from stdin if no parameter given
@@ -17,7 +17,7 @@
   $map{$olddevice} = $grubdevice;
 }
 
-$device=~ m#^(/dev/(?:[sh]d\D|i2o/hd\D|ida/c\d*d\d*|cciss/c\d*d\d*))p*(\d*)$# || die "Can't match device: $device\n";
+$device=~ m#^(/dev/(?:[shv]d\D|i2o/hd\D|ida/c\d*d\d*|cciss/c\d*d\d*))p*(\d*)$# || die "Can't match device: $device\n";
 my ($disk,$partition) = ($1,$2);
 
 if ($map{$disk}) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-02-02 16:41:17 UTC (rev 5719)
+++ trunk/debian/changelog	2010-02-03 10:06:01 UTC (rev 5720)
@@ -1,4 +1,4 @@
-fai (3.3.3~beta3) unstable; urgency=low
+fai (3.3.3~beta4) unstable; urgency=low
 
   [ Thomas Lange ]
   * lib/mkramdisk: new script that mounts a ramdisk onto a directory and
@@ -24,6 +24,7 @@
   * fai-debconf: ignore files that cannot match a class name
   * fai-client.install: add mkramdisk
   * QUESTIONNAIRE: remove some older questions
+  * device2grub: add support for devices named vdX (closes: #568203)
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.2
@@ -42,7 +43,7 @@
   * setup-storage/Commands.pm: Add -q to createopts when making reiser file
     systems (thanks Mathieu Alorent and Thomas Neumann).
 
- -- Thomas Lange <lange at debian.org>  Tue, 02 Feb 2010 16:46:40 +0100
+ -- Thomas Lange <lange at debian.org>  Wed, 03 Feb 2010 11:05:31 +0100
 
 fai (3.3.2) unstable; urgency=low