[Fai-commit] r5273 - branches/lenny/bin branches/lenny/debian trunk/bin trunk/debian

[holger at alioth.debian.org]

Author: holger
Date: 2009-02-20 10:44:06 +0000 (Fri, 20 Feb 2009)
New Revision: 5273

Modified:
   branches/lenny/bin/device2grub
   branches/lenny/debian/changelog
   trunk/bin/device2grub
   trunk/debian/changelog
Log:
  * device2grub: Add /dev/i2o/hdX  to the list of recognized devices. Thanks
    to J?\195?\188rgen Kahnert for the patch. (Closes: #515101)



Modified: branches/lenny/bin/device2grub
===================================================================
--- branches/lenny/bin/device2grub	2009-02-17 14:17:31 UTC (rev 5272)
+++ branches/lenny/bin/device2grub	2009-02-20 10:44:06 UTC (rev 5273)
@@ -17,7 +17,7 @@
   $map{$olddevice} = $grubdevice;
 }
 
-$device=~ m#^(/dev/(?:[sh]d\D|ida/c\d*d\d*|cciss/c\d*d\d*))p*(\d*)$# || die "Can't match device: $device\n";
+$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";
 my ($disk,$partition) = ($1,$2);
 
 if ($map{$disk}) {

Modified: branches/lenny/debian/changelog
===================================================================
--- branches/lenny/debian/changelog	2009-02-17 14:17:31 UTC (rev 5272)
+++ branches/lenny/debian/changelog	2009-02-20 10:44:06 UTC (rev 5273)
@@ -5,6 +5,8 @@
     (Closes: #504662)
   * fai-mirror: honor $debug and $qflag environment variables, thanks to 
     Michael Tautschnig. (Closes: #494431)
+  * device2grub: Add /dev/i2o/hdX  to the list of recognized devices. Thanks
+    to Jürgen Kahnert for the patch. (Closes: #515101)
 
  -- Holger Levsen <holger at debian.org>  Tue, 17 Feb 2009 14:36:37 +0100
 

Modified: trunk/bin/device2grub
===================================================================
--- trunk/bin/device2grub	2009-02-17 14:17:31 UTC (rev 5272)
+++ trunk/bin/device2grub	2009-02-20 10:44:06 UTC (rev 5273)
@@ -17,7 +17,7 @@
   $map{$olddevice} = $grubdevice;
 }
 
-$device=~ m#^(/dev/(?:[sh]d\D|ida/c\d*d\d*|cciss/c\d*d\d*))p*(\d*)$# || die "Can't match device: $device\n";
+$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";
 my ($disk,$partition) = ($1,$2);
 
 if ($map{$disk}) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-02-17 14:17:31 UTC (rev 5272)
+++ trunk/debian/changelog	2009-02-20 10:44:06 UTC (rev 5273)
@@ -59,6 +59,8 @@
     (Closes: #504662)
   * fai-mirror: honor $debug and $qflag environment variables, thanks to 
     Michael Tautschnig. (Closes: #494431)
+  * device2grub: Add /dev/i2o/hdX  to the list of recognized devices. Thanks
+    to Jürgen Kahnert for the patch. (Closes: #515101)
 
  -- Thomas Lange <lange at debian.org>  Mon, 16 Feb 2009 18:51:36 +0100